Updated navigator constructors