Fix router
Migration WIP