Base class updated

Added the base class