Restful refactor