Added navigation factory