Added batch_size option