Support for new location hierarchy