support new datamodel