Updated file class