Fix creation of hierarchy
Fix error because of modified import