More support for base classes