Improved FileModel