Add: Switch to registry for router registration