Implemented multiple directory support