Added support for expanded file paths.