Improve base inheritance