improved support for hierarchical data