Changed: _type_id to _class_id in model code