Add support for output directory