Added support for Navigator