Improve output dir settings