Update to BatchController