Changed based class to base class