Datamodel slightly adapted.