Improvements to base classes