Added directory support