Merge datamodel branch

Lets mrege the datamodel back into dev as the other groups should have a continuous view on the this specific topic.