Modify controller to support Navigator