RESTfull Refactor