Updated file read / write