Added batch size option