Updated returned navigation data to be hierarchical