simplify datamodel