Now works for Hierarchical systems