Updates to NavigatorEvent for better control over routing flow