Refactored index enqueueing callbacks