DRY; make sure correct externalId set for composite stores