Added support for Files