Added refactored model for superclass