Add navigator and external