added full hypermedia support