Added new Base class