Removed functionality in order to re-implement at base class level