Changed datamodel by Twan recommendations