diff --git a/src/Potter/Controller.php b/src/Potter/Controller.php
index 27cd9da..bbb835f 100644
--- a/src/Potter/Controller.php
+++ b/src/Potter/Controller.php
@@ -10,9 +10,11 @@ abstract class Controller
 {
     public function __construct(Container $container)
     {
-        static::mapRoutes(
+        $this->mapRoutes(
             container: $container,
             router: static::getRouter($container));
+        $container->addShared(static::class)
+            ->addArgument($container);
     }
     
     private static function getRouter(Container $container): Router
@@ -20,5 +22,5 @@ abstract class Controller
         return $container->get(Router::class);
     }
     
-    abstract static protected function mapRoutes(Container $container, Router $router): void;
+    abstract protected function mapRoutes(Container $container, Router $router): void;
 }