diff --git a/docs/src/05_building_block_view.adoc b/docs/src/05_building_block_view.adoc
index f6888d6e..00f7ed75 100644
--- a/docs/src/05_building_block_view.adoc
+++ b/docs/src/05_building_block_view.adoc
@@ -45,12 +45,12 @@ package "WIQ App" {
 :User: -> [WebApp] : " Interacts    "
 [WebApp] <-> [Gateway Service] : Redirects Requests
 [Gateway Service] <--down-> [Game Service] : Plays
-[Gateway Service] <-- [Question Historic Service] : Loads data
-[Gateway Service] <-- [User Statistics Service] : Loads data
+[Gateway Service] <-- [Store Question Service] : Loads data
+[Gateway Service] <-- [User Stats Service] : Loads data
 [Gateway Service] <-> [UserAuth Service] : Logs in / Registers
-[Game Service] -> [User Statistics Service] : Stores data
+[Game Service] -> [User Stats Service] : Stores data
 [Game Service] <-left-> [Questions Service] : Gets questions
-[Questions Service] -up-> [Question Historic Service] : Stores data
+[Questions Service] -up-> [Store Question Service] : Stores data
 }
 [Questions Service] <.left.> [WikiData] : "  Gets data  "
 ----
@@ -87,28 +87,25 @@ package "WIQ App"{
     component "WebApp"
     component "Gateway Service" as GatewayS
 
-    package "Game Service" {
-        component "Game Controller"
+    component "Game Service" 
+        package "Store Question Service" as QHS{
+        component "Store-Q Service" as QHController
+        database "storedquestion" as QhDB
     }
-
-    package "User Statistics Service" as USS {
-        component "Statistics Controller"
-        database "Database" as USDB
-    }
-
-    package "Questions Historic Service" as QHS{
-        component "Question Historic Controller" as QHController
-        database "Database" as QhDB
-    }
-    package "Questions Service"{
-        component "Wikidata Extractor"
-        component "Questions Generator"
-        database "Database" as QSDB
+    package "User Stats Service" as USS {
+        component "User Stats Service"
+        database " statsdb " as USDB
     }
     package "UserAuth Service" {
         component "Auth Service"
         component "User Service"
-        database "Database" as UADB
+        database "userdb" as UADB
+    }
+
+    package "Questions Service"{
+        component "Wikidata Extractor"
+        component "Questions Generator Service"
+        database "questions" as QSDB
     }
 }
 
@@ -116,25 +113,25 @@ User -right-> WebApp : Uses
 WebApp <-right-> GatewayS: Redirects requests
 
 GatewayS <--up--> "UserAuth Service" : "Handles user\nlogin/registry"
-GatewayS <-down-> "Game Service" : "Handles user current game\n"
+GatewayS <-down-> "Game Service" : "Handles user current game"
 GatewayS <--up-- "QHS" : "\nReceives generated\nquestions"
 GatewayS <--- "USS" : "Receives\t\t\t\nuser statistics\t\t\t"
 
 "Game Service" <---> "Questions Service" : "Receives question petitions,\nsends questions\n\n"
 "Game Service" ---> "USS" : "Sends user\t\nstatistics\t\t"
-"Questions Service" -up-> "QHS" : "Sends\ngenerated\nquestions"
+"Questions Service" -up-> "QHS" : " Sends\n  generated\n  questions"
 
 "Wikidata" .up.> "Wikidata Extractor" : "Returns data"
 "Wikidata" <.up. "Wikidata Extractor" : "Queries"
 "Wikidata Extractor" --> QSDB
-"Questions Generator" <-- QSDB
-"Questions Generator" --> QSDB
+"Questions Generator Service" <-- QSDB
+"Questions Generator Service" --> QSDB
 
 "QHController" --> QhDB
 "QHController" <-- QhDB
 
-"Statistics Controller" --> USDB
-"Statistics Controller" <-- USDB
+"User Stats Service" --> USDB
+"User Stats Service" <-- USDB
 
 "Auth Service" --> UADB
 "Auth Service" <-- UADB
diff --git a/docs/src/07_deployment_view.adoc b/docs/src/07_deployment_view.adoc
index 2c1525aa..7fbdc341 100644
--- a/docs/src/07_deployment_view.adoc
+++ b/docs/src/07_deployment_view.adoc
@@ -19,23 +19,26 @@ cloud "Azure Cloud\n" {
             node "Gateway Container"{
                 node "Gateway Service"
             }
-            node "  User Container  "{
+            node "User Container"{
                 node "User Service"
             }
-            node "  Auth Container  "{
+            node "Auth Container"{
                 node "Auth Service"
             }
-            node "\tGame Container\t"{
-                node "Game Generator Service"
+            node "Game Container"{
+                node "Game Service"
             }
-            node "Questions History Container"{
-                node "Questions History Service"
+            node "Store Question Container"{
+                node "Store Question Service"
             }
             node "User Stats Container\t"{
                 node "User Stats Service"
             }
-            node "Questions Generator Container"{
-                node "Questions Generator Service"
+            node "Question Generator Container"{
+                node "Question Generator Service"
+            }
+            node "Wikidata Extractor Container"{
+                node "Wikidata Extractor Service"
             }
         }
     }
@@ -49,17 +52,19 @@ actor "User"
 
 "Web App" -- "Gateway Service" : "port: 8000"
 
-"Gateway Service" -- "Questions History Service" : "port: 8004             "
+"Gateway Service" -- "Store Question Service" : "port: 8004"
 "Gateway Service" -- "User Stats Service" : "port: 8003"
 "Gateway Service" -up- "Auth Service" : "port: 8002         "
 "Gateway Service" -up- "User Service" : "port: 8001"
-"Gateway Service" -right- "Game Generator Service"  : "           port: 8005     "
+"Gateway Service" -right- "Game Service"  : "           port: 8005     "
+
+"Game Service" -- "User Stats Service" : "port: 8003"
+"Game Service" -- "Question Generator Service" : " port: 8007"
 
-"Game Generator Service" -- "User Stats Service" : "port: 8003"
-"Game Generator Service" -- "Questions Generator Service" : " port: 8006"
+"Question Generator Service" -- "Store Question Service" : "port: 8004"
+"Question Generator Service" -- "Wikidata Extractor Service" : "port: 8008"
 
-"Questions Generator Service" -- "Questions History Service" : "port: 8004"
-"Questions Generator Service" -- "Wikidata" : "HTTPS"
+"Wikidata Extractor Service" -- "Wikidata" : "HTTPS"
 ----
 
 In addition to what is shown in the diagram, we will also use Graphana and Prometheus during the production stage as code monitoring systems.