WIP according to datamodel changes