Fix model definitions