Various changes to File deal