Increase timeout and lower the batch size