Added HATEOAS support