Add batch and improve indexes