Small fixes
Hierarchy refactored