Changes to support new Navchuk library