fixup! Implement hierarchical