Rework on autonav template