Move  to the NavigationContext