Adding support for second level navigation