Added recursive support for sub directories