Added navigation mapper