Added options to change the batch size