diff --git a/lib/src/declarative_navigatable/stateless_navigator.dart b/lib/src/declarative_navigatable/stateless_navigator.dart
index 2a8216c..14efa1c 100644
--- a/lib/src/declarative_navigatable/stateless_navigator.dart
+++ b/lib/src/declarative_navigatable/stateless_navigator.dart
@@ -1,8 +1,16 @@
 import 'package:fdr/fdr.dart';
 
-abstract class StatelessNavigator extends MappedNavigatableSource<void> {
-  StatelessNavigator() : super(initialState: null);
+abstract class StatelessNavigator extends StatefulNavigator {
+  List<DeclarativeNavigatable> build();
 
   @override
-  List<DeclarativeNavigatable> build();
+  StatefulNavigatorState<StatefulNavigator> createState() =>
+      _StatelessNavigatorState();
+}
+
+class _StatelessNavigatorState extends StatefulNavigatorState {
+  @override
+  List<DeclarativeNavigatable> build() {
+    return (navigator as StatelessNavigator).build();
+  }
 }