updated model conforming to Hugo's HyperGraph model