Updated api with new navigation system