Improve classes.