Added support for directory arguments