Added ability to override default directory