Added batch file support