Revised Navigator Schema