Updates routes to more closely match the API.
Fixed crashing