Extended some base classes.