Addition of working navigation