removed unnecessary subclasses, moved featured onto model classes with a default value of NO