Hacked-together batch support