Added index to external_id field