Refactoring hierarchy
Refactoring hierarchy