Enhance base classes