More FromExternalId, plus imports