Fix: Use default router implementation