Added support for specifying input folder