Fix hierarchy issue

Fixing child hierarchy