Updated FileUtil