Updated the Org/instance selection method