Add router, fix more instances