diff --git a/.code-intelligence/campaigns/AllController-a7e91866.json b/.code-intelligence/campaigns/AllController-a7e91866.json
index abe6a947..a32976ba 100644
--- a/.code-intelligence/campaigns/AllController-a7e91866.json
+++ b/.code-intelligence/campaigns/AllController-a7e91866.json
@@ -15,6 +15,7 @@
       "numberOfJobs": 1
     }
   ],
+  "skipInitialCorpus": true,
   "configuredTargets": [
     {
       "fuzzTarget": "AllController-ae4f0ca2",
diff --git a/.code-intelligence/ci_info b/.code-intelligence/ci_info
index 92db9913..13adc7c8 100755
--- a/.code-intelligence/ci_info
+++ b/.code-intelligence/ci_info
@@ -21,6 +21,8 @@
         "org.dpppt.backend.sdk.data.util",
         "org.dpppt.backend.sdk.model",
         "org.dpppt.backend.sdk.model.gaen",
+        "org.dpppt.backend.sdk.model.gaen.proto",
+        "org.dpppt.backend.sdk.model.gaen.proto.v2",
         "org.dpppt.backend.sdk.model.keycloak",
         "org.dpppt.backend.sdk.semver",
         "org.dpppt.backend.sdk.utils",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json
index c75dc966..9ad80d33 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "GET",
-        "uri": "/v1/exposedjson/%FUZZ%1606989600000",
+        "uri": "/v1/exposedjson/%FUZZ%1615902606000",
         "headers": {
         },
         "contentType": "TEXT_HTML",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json
index 03c08af8..b7b0e6ca 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "GET",
-        "uri": "/v1/gaen/exposed/%FUZZ%1606989600000?publishedafter=%FUZZ%1606989600000",
+        "uri": "/v1/gaen/exposed/%FUZZ%1615902606000?publishedafter=%FUZZ%1615902606000",
         "headers": {
         },
         "contentType": "TEXT_HTML",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json
index d640e228..f2731552 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "GET",
-        "uri": "/v1/exposed/%FUZZ%1606989600000",
+        "uri": "/v1/exposed/%FUZZ%1615902606000",
         "headers": {
         },
         "contentType": "TEXT_HTML",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json
index 92f684ad..b128d525 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "GET",
-        "uri": "/v1/gaen/exposedjson/%FUZZ%1606989600000?publishedafter=%FUZZ%1606989600000",
+        "uri": "/v1/gaen/exposedjson/%FUZZ%1615902606000?publishedafter=%FUZZ%1615902606000",
         "headers": {
         },
         "contentType": "TEXT_HTML",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json
index 92253651..616be149 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "GET",
-        "uri": "/v1/gaen/buckets/03-12-20",
+        "uri": "/v1/gaen/buckets/2021-03-16",
         "headers": {
         },
         "contentType": "TEXT_HTML",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json
index 6a3b45a0..90c99c7d 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json
@@ -10,7 +10,7 @@
         "headers": {
         },
         "contentType": "APPLICATION_JSON",
-        "body": "{\"key\": \"dGVzdEtleTMyQnl0ZXMtLXRlc3RLZXkzMkJ5dGVzLS0=\", \"keyDate\": \"1589039479223\"}",
+        "body": "{\"gaenKeys\":[{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhMQ==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNiMg==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNjMw==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1}],\"delayedKeyDate\":2693232}",
         "isFixed": false,
         "webControllerId": "772282204"
       }
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json
index c7e109b6..74d2ab7a 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "GET",
-        "uri": "/v1",
+        "uri": "/v2",
         "headers": {
         },
         "contentType": "TEXT_HTML",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json
index 266735f7..f1ff014d 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json
@@ -6,11 +6,11 @@
     "requests": [
       {
         "method": "POST",
-        "uri": "/v1/exposed",
+        "uri": "/v2/exposed",
         "headers": {
         },
         "contentType": "APPLICATION_JSON",
-        "body": "{\"key\": \"dGVzdEtleTMyQnl0ZXMtLXRlc3RLZXkzMkJ5dGVzLS0=\", \"keyDate\": \"1589039479223\"}",
+        "body": "{\"gaenKeys\":[{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhMQ==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNiMg==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNjMw==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1}],\"delayedKeyDate\":2693232}",
         "isFixed": false,
         "webControllerId": "-608625832"
       }
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json
index 7dc883e7..d9fdf060 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "GET",
-        "uri": "/v1/buckets/%FUZZ%",
+        "uri": "/v2/buckets/%FUZZ%",
         "headers": {
         },
         "contentType": "TEXT_HTML",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json
index a02d0a28..256943b0 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "POST",
-        "uri": "/v1/exposedlist",
+        "uri": "/v2/exposedlist",
         "headers": {
         },
         "contentType": "APPLICATION_JSON",
diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json
index 38920fd1..13a14a6a 100644
--- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json
+++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json
@@ -6,7 +6,7 @@
     "requests": [
       {
         "method": "POST",
-        "uri": "/v1/gaen/exposednextday",
+        "uri": "/v2/gaen/exposednextday",
         "headers": {
         },
         "contentType": "APPLICATION_JSON",
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a72d3fa9..a5afba8c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,15 +1,14 @@
-name: CI
+name: Code Intelligence Fuzzing
 
 on:
   push:
-    branches: [ master, demo_before_fix ]
+    branches: [ master, demo_before_fix, fixed_version ]
   pull_request:
-    branches: [ master, demo_before_fix ]
+    branches: [ master, demo_before_fix, fixed_version ]
 
 env:
-  PROJECT_NAME: dp3t
-  FUZZING_SERVER_ADDRESS: grpc-api.demo.code-intelligence.com:443
-  DASHBOARD_ADDRESS: https://app.demo.code-intelligence.com
+  FUZZING_SERVER_ADDRESS: grpc-api.code-intelligence.com:443
+  DASHBOARD_ADDRESS: https://app.code-intelligence.com 
 
 jobs:
   fuzz_AllController:
@@ -17,34 +16,32 @@ jobs:
     steps:
       - id: start-fuzzing
         name: Build and Instrument
-        uses: CodeIntelligenceTesting/github-actions/start-fuzzing@master
+        uses: CodeIntelligenceTesting/github-actions/start-fuzzing@v3
         with:
           ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }}
-          project: ${{ env.PROJECT_NAME }}
-          test_collection: "AllController"
+          test_collection: "projects/dp3t_git-cc9aec38a841e381/campaigns/AllController-a7e91866"
           git_reference: ${{ github.sha }}
-          fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }}
+          fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }}          
       - id: monitor-fuzzing
         name: Fuzzing
-        uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@master
+        uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@v3
         with:
           ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }}
-          project: ${{ env.PROJECT_NAME }}
-          test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run_display_name }}
+          test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pull_request_number: ${{ github.event.pull_request.number }}
           owner: ${{ github.event.repository.owner.login }}
           repository: ${{ github.event.repository.name }}
           fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }}
           dashboard_address: ${{ env.DASHBOARD_ADDRESS }}
+          timeout: ${{7200}}
       - id: report-coverage
         name: Report Coverage
-        uses: CodeIntelligenceTesting/github-actions/report-coverage@master
+        uses: CodeIntelligenceTesting/github-actions/report-coverage@v3
         if: ${{ github.event_name == 'pull_request' && (success() || failure()) }}
         with:
           ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }}
-          project: ${{ env.PROJECT_NAME }}
-          test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run_resource_name }}
+          test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pull_request_number: ${{ github.event.pull_request.number }}
           owner: ${{ github.event.repository.owner.login }}
@@ -52,3 +49,4 @@ jobs:
           git_reference: ${{ github.sha }}
           fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }}
           dashboard_address: ${{ env.DASHBOARD_ADDRESS }}
+          
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
deleted file mode 100644
index 2a72cce0..00000000
--- a/.github/workflows/pre-commit.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: pre-commit
-
-on:
-  pull_request:
-  push:
-    branches: [develop]
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: '11'
-    - uses: pre-commit/action@v2.0.0