directory support improved