Move navigation related method to NavigationContext