[VOLO-93] New Domainmodell and Datamodell