Improve bulk indexing