Enhance Hateoas features