Fixing routes and registration steps