Refactoring, moved from HATEOAS to CRUD.