Added support for non-standard file-directory-paths.