various data model updates