Completely refactored navigation data stucture and model