Update data model

moar data model updates