Update to handling external Org references