Hierarchy providers refactored