Updates for new classes.