diff --git a/ezgg_website/__init__.py b/ezgg_website/__init__.py
index 7cc804b..7d95fc6 100644
--- a/ezgg_website/__init__.py
+++ b/ezgg_website/__init__.py
@@ -126,7 +126,7 @@ app = rio.App(
         rio.Page(
             name="Member",
             page_url='member',
-            build=lambda: pages.Member(database_service),
+            build=pages.Member,
         ),
         rio.Page(
             name="Constitution",
@@ -141,7 +141,7 @@ app = rio.App(
         rio.Page(
             name="Pics",
             page_url='pics',
-            build=lambda: pages.Pics(database_service),
+            build=pages.Pics,
         ),
         rio.Page(
             name="Imprint",
@@ -157,5 +157,6 @@ app = rio.App(
     theme=themes[6],
     icon=from_root("ezgg_website/assets/icons/favicon.png"),
     assets_dir=Path(__file__).parent / "assets",
-    on_session_start=on_session_start
+    on_session_start=on_session_start,
+    default_attachments=[database_service]
 )
diff --git a/ezgg_website/pages/member.py b/ezgg_website/pages/member.py
index 2e12db2..bec0012 100644
--- a/ezgg_website/pages/member.py
+++ b/ezgg_website/pages/member.py
@@ -12,9 +12,9 @@ from .. import services
 class Member(rio.Component):
     database_service: services.DatabaseService
 
-    def __init__(self, database_service: services.database_service.DatabaseService) -> None:
+    def __init__(self) -> None:
         super().__init__()
-        self.database_service = database_service
+        self.database_service = self.session[services.DatabaseService]
 
     @rio.event.on_populate
     async def on_populate(self) -> None:
diff --git a/ezgg_website/pages/pics.py b/ezgg_website/pages/pics.py
index 4bd7861..b6d2ac4 100644
--- a/ezgg_website/pages/pics.py
+++ b/ezgg_website/pages/pics.py
@@ -13,9 +13,9 @@ class Pics(rio.Component):
     database_service: services.DatabaseService
     active_picture: Optional[rio.URL]
 
-    def __init__(self, database_service: services.database_service.DatabaseService) -> None:
+    def __init__(self) -> None:
         super().__init__()
-        self.database_service = database_service
+        self.database_service = self.session[services.DatabaseService]
         self.active_picture: Optional[rio.URL] = None
 
     @rio.event.on_populate