Update to use file-utils methods