Modified the base class to add better comments