Add model classes
Convert to use model classes