TODO added for DirectoryDAO