Added batch control