Added support for --outdir