Updated navigation facilities