Fixed support for Files