Refactoring ready for new navigation system