Added functionality for structuring navigations