Refactored out Hypermedia Serialization