Add hierarchial name resolution