Some updates on classes.