Improved BaseClass.