Revised Class Hierarchy
New abstract
class