Added initial support for File