New class hierarchy.