Improved core classes.