Updates to routes and users service