HierarchyStorage - code review