Minor changes in base class implementation