Commit latest changes before refactoring to use CommonNavigator