Make index construction more efficient