Added compatibility with non standard files directories.