DataDirs: abstract more