model classes updated - no more polymorphic