Updated plugin to use NavigationResult