Changes to the class hierarchy.