Add model classes
Fix models