Solve Hierarchy service issues