Added class hierarchy