Added/fixed model classes
Fix