In the middle of more tracing, added NavigationKind