Fixed class hierarchy