diff --git a/agent_application/docker/db/init.sql b/agent_application/docker/db/init.sql
index f333905c..e8d2d537 100644
--- a/agent_application/docker/db/init.sql
+++ b/agent_application/docker/db/init.sql
@@ -18,6 +18,14 @@ CREATE TABLE offer
     PRIMARY KEY (view_id)
 );
 
+CREATE TABLE all_offers
+(
+    view_id           text                        NOT NULL,
+    version           bigint CHECK (version >= 0) NOT NULL,
+    payload           json                        NOT NULL,
+    PRIMARY KEY (view_id)
+);
+
 CREATE TABLE pre_authorized_code
 (
     view_id           text                        NOT NULL,
@@ -42,6 +50,14 @@ CREATE TABLE credential
     PRIMARY KEY (view_id)
 );
 
+CREATE TABLE all_credentials
+(
+    view_id           text                        NOT NULL,
+    version           bigint CHECK (version >= 0) NOT NULL,
+    payload           json                        NOT NULL,
+    PRIMARY KEY (view_id)
+);
+
 CREATE TABLE server_config
 (
     view_id           text                        NOT NULL,
@@ -58,7 +74,7 @@ CREATE TABLE received_offer
     PRIMARY KEY (view_id)
 );
 
-CREATE TABLE all_offers
+CREATE TABLE all_received_offers
 (
     view_id           text                        NOT NULL,
     version           bigint CHECK (version >= 0) NOT NULL,
@@ -75,7 +91,7 @@ CREATE TABLE holder_credential
 );
 
 
-CREATE TABLE all_credentials
+CREATE TABLE all_holder_credentials
 (
     view_id           text                        NOT NULL,
     version           bigint CHECK (version >= 0) NOT NULL,