Improved some classes.