Improved new classes.