Refactor DirectoryService#find