Improving the component base classes.