Updated file utils