Minor hierarchical changes