Added MK2 navigation support