Added directory support for exporting associated directories