Also add batch mode option