Update to new router for apis