adapt to changes in datamodel