Fixed models, based on latest schema changes from Data