Refactored the way we pass data around for HATEOAS