Adjusted to use new Navigation API