Updates to FileUtils