Updated class hierarchy.