Added substantially more data to the navigation