Added isDefined