Adding directory support