Updated more classes.