Updated inheritance of base classes