Fix model classes