Added support for command file and password