Add more navigation support