diff --git a/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.png b/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.png
index 6a569f6fbde3b8e732236ae48ff6dd9948e548c0..48e32130872ff170ef9e4a302e63655975a9d1dc 100644
Binary files a/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.png and b/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.png differ
diff --git a/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.txt b/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.txt
index 705cc8ede47b6d64eac52caf8842f984732202c2..6e0d7c8c440ac549546cb0c9bcff9e9dde31fa0b 100644
--- a/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.txt
+++ b/docs/blueprints/rki_vaccination/uml_implementation/rki_vaccination_use_cases.txt
@@ -1,50 +1,77 @@
 @startuml
 left to right direction
-actor Visitor as vu
-package user {
+package covid19.blueprints.app_user {
+	actor AnonymousVisitor as vu
+	actor AppManager as au
 	actor SysAdmin as su
-	actor Admin as au
+	actor AppDevTester as du
 }
-package rki_views_frontend {
-	usecase url_vaccination_info as UC1
-	usecase url_vaccination_tasks as UC2
-	usecase url_vaccination_imported as UC3
-	usecase url_vaccination_data as UC4
+package covid19.blueprints.app_user {
+	vu <|-- au
+	vu <|-- su
+	su <|-- du
+	au <|-- du
 }
-package rki_vaccination_views_for_tasks {
-	usecase task_who_download_only as UC50
-	usecase task_who_import_only as UC51
-	usecase task_who_update_dimension_tables_only as UC52
-	usecase task_who_update_fact_table_initial_only as UC53
-	usecase task_who_update_fact_table_incremental_only as UC54
-	usecase task_who_update_star_schema_initial as UC55
-	usecase task_who_update_star_schema_incremental as UC56
+package covid19.blueprints.rki_vaccination.rki_vaccination_views_frontend {
+	usecase url_get_import as UC30
+	usecase url_get_flat as UC31
+	usecase url_get_years as UC40
+	usecase url_get_days as UC41
+	usecase url_get_days_for_year as UC42
+	usecase url_get_location_groups as UC43
+	usecase url_get_locations_for_location_group as UC44
+	usecase url_get_data_for_location as UC45
+	usecase url_get_data_for_day as UC46
+    usecase url_page_info as UC80
 }
-package rki_vaccination_celery_tasks {
-	usecase url_vaccination_task_download_only as UC100
-	usecase url_vaccination_task_import_only as UC101
-	usecase url_vaccination_task_update_dimensiontables_only as UC102
-	usecase url_vaccination_task_update_facttable_incremental_only as UC103
-	usecase url_vaccination_task_update_facttable_initial_only as UC104
-	usecase url_vaccination_task_update_starschema_initial as UC105
-	usecase url_vaccination_task_update_starschema_incremental as UC106
+vu --> UC30
+vu --> UC31
+vu --> UC40
+vu --> UC41
+vu --> UC42
+vu --> UC43
+vu --> UC44
+vu --> UC45
+vu --> UC46
+vu --> UC80
+package covid19.blueprints.rki_vaccination.rki_vaccination_views_for_tasks {
+	usecase url_download_file as UC1
+	usecase url_import_file as UC2
+	usecase url_import_file_flat as UC3
+	usecase url_full_update_dimension_tables as UC10
+	usecase url_full_update_fact_table as UC11
+	usecase url_full_update_star_schema as UC12
+	usecase url_update_dimension_tables as UC20
+	usecase url_update_fact_table as UC21
+	usecase url_update_star_schema as UC22
+    usecase url_page_tasks as UC81
 }
-vu --> UC1
-vu --> UC2
-vu --> UC3
-vu --> UC4
-au --> UC50
-au --> UC51
-au --> UC52
-au --> UC53
-au --> UC54
-au --> UC55
-au --> UC56
-UC50 --> UC100
-UC51 --> UC101
-UC52 --> UC102
-UC53 --> UC103
-UC54 --> UC104
-UC55 --> UC105
-UC56 --> UC106
+au --> UC1
+au --> UC2
+au --> UC3
+au --> UC10
+au --> UC11
+au --> UC12
+au --> UC20
+au --> UC21
+au --> UC22
+au --> UC81
+package covid19.blueprints.rki_vaccination.rki_vaccination_celery_tasks {
+	usecase task_import_file as UC102
+	usecase task_import_file_flat as UC103
+	usecase task_full_update_dimension_tables as UC110
+	usecase task_full_update_fact_table as UC111
+	usecase task_full_update_star_schema as UC112
+	usecase task_update_dimension_tables as UC120
+	usecase task_update_fact_table as UC121
+	usecase task_update_star_schema as UC122
+}
+UC2 --> UC102
+UC3 --> UC103
+UC10 --> UC110
+UC11 --> UC111
+UC12 --> UC112
+UC20 --> UC120
+UC21 --> UC121
+UC22 --> UC122
 @enduml
\ No newline at end of file
diff --git a/docs/blueprints/who/uml_implementation/who_use_cases.txt b/docs/blueprints/who/uml_implementation/who_use_cases.txt
index 05d027e19f7c2d7480721d46068884c2623584ee..e2525397e1a29a60424c9834829059cafe4a3a3f 100644
--- a/docs/blueprints/who/uml_implementation/who_use_cases.txt
+++ b/docs/blueprints/who/uml_implementation/who_use_cases.txt
@@ -1,82 +1,77 @@
 @startuml
 left to right direction
-actor Visitor as vu
-package user {
-  actor SysAdmin as su
-  actor Admin as au
+package covid19.blueprints.app_user {
+	actor AnonymousVisitor as vu
+	actor AppManager as au
+	actor SysAdmin as su
+	actor AppDevTester as du
 }
-package who_views_frontend {
-  usecase url_who_info as UC1
-  usecase url_who_tasks as UC2
-  usecase url_who_imported as UC3
-  usecase url_who_date_reported_all as UC4
-  usecase url_who_date_reported as UC5
-  usecase url_who_date_reported_cases_new as UC6
-  usecase url_who_date_reported_cases_cumulative as UC7
-  usecase url_who_date_reported_deaths_new as UC8
-  usecase url_who_date_reported_deaths_cumulative as UC9
-  usecase url_who_region_all as UC10
-  usecase url_who_region as UC11
-  usecase url_who_country_all as UC12
-  usecase url_who_country as UC13
-  usecase url_who_country_cases_new as UC14
-  usecase url_who_country_cases_cumulative as UC15
-  usecase url_who_country_deaths_new as UC16
-  usecase url_who_country_deaths_cumulative as UC17
-  usecase url_who_germany as UC18
-  usecase url_who_region_all as UC19
-  usecase url_who_region_all as UC20
+package covid19.blueprints.app_user {
+	vu <|-- au
+	vu <|-- su
+	su <|-- du
+	au <|-- du
 }
-package who_views_for_tasks {
-	usecase url_task_who_download_only as UC50
-	usecase url_task_who_import_only as UC51
-	usecase url_task_who_update_dimension_tables_only as UC52
-	usecase url_task_who_update_fact_table_initial_only as UC53
-	usecase url_task_who_update_fact_table_incremental_only as UC54
-	usecase url_task_who_update_star_schema_initial as UC55
-	usecase url_task_who_update_star_schema_incremental as UC56
+package covid19.blueprints.who.who_views_frontend {
+	usecase url_get_import as UC30
+	usecase url_get_flat as UC31
+	usecase url_get_years as UC40
+	usecase url_get_days as UC41
+	usecase url_get_days_for_year as UC42
+	usecase url_get_location_groups as UC43
+	usecase url_get_locations_for_location_group as UC44
+	usecase url_get_data_for_location as UC45
+	usecase url_get_data_for_day as UC46
+    usecase url_page_info as UC80
 }
-package who_celery_tasks {
-  usecase task_who_download_only as UC100
-  usecase task_who_import_only as UC101
-  usecase task_who_update_dimension_tables_only as UC102
-  usecase task_who_update_fact_table_initial_only as UC103
-  usecase task_who_update_fact_table_incremental_only as UC104
-  usecase task_who_update_star_schema_initial as UC105
-  usecase task_who_update_star_schema_incremental as UC106
+vu --> UC30
+vu --> UC31
+vu --> UC40
+vu --> UC41
+vu --> UC42
+vu --> UC43
+vu --> UC44
+vu --> UC45
+vu --> UC46
+vu --> UC80
+package covid19.blueprints.who.who_views_for_tasks {
+	usecase url_download_file as UC1
+	usecase url_import_file as UC2
+	usecase url_import_file_flat as UC3
+	usecase url_full_update_dimension_tables as UC10
+	usecase url_full_update_fact_table as UC11
+	usecase url_full_update_star_schema as UC12
+	usecase url_update_dimension_tables as UC20
+	usecase url_update_fact_table as UC21
+	usecase url_update_star_schema as UC22
+    usecase url_page_tasks as UC81
 }
-vu --> UC1
-vu --> UC2
-vu --> UC3
-vu --> UC4
-vu --> UC5
-vu --> UC6
-vu --> UC7
-vu --> UC8
-vu --> UC9
-vu --> UC10
-vu --> UC11
-vu --> UC12
-vu --> UC13
-vu --> UC14
-vu --> UC15
-vu --> UC16
-vu --> UC17
-vu --> UC18
-vu --> UC19
-vu --> UC20
-au --> UC50
-au --> UC51
-au --> UC52
-au --> UC53
-au --> UC54
-au --> UC55
-au --> UC56
-UC50 --> UC100
-UC51 --> UC101
-UC52 --> UC102
-UC53 --> UC103
-UC54 --> UC104
-UC55 --> UC105
-UC56 --> UC106
+au --> UC1
+au --> UC2
+au --> UC3
+au --> UC10
+au --> UC11
+au --> UC12
+au --> UC20
+au --> UC21
+au --> UC22
+au --> UC81
+package covid19.blueprints.who.who_celery_tasks {
+	usecase task_import_file as UC102
+	usecase task_import_file_flat as UC103
+	usecase task_full_update_dimension_tables as UC110
+	usecase task_full_update_fact_table as UC111
+	usecase task_full_update_star_schema as UC112
+	usecase task_update_dimension_tables as UC120
+	usecase task_update_fact_table as UC121
+	usecase task_update_star_schema as UC122
+}
+UC2 --> UC102
+UC3 --> UC103
+UC10 --> UC110
+UC11 --> UC111
+UC12 --> UC112
+UC20 --> UC120
+UC21 --> UC121
+UC22 --> UC122
 @enduml
\ No newline at end of file