Modify base classes