changed datamodel