Add two hierarchy functions and change "of which the" in a return label to "whose"