Added option batch-size