Add Hateoas that wraps the serializer, update the builder