Fixed hypermedia links and model issues