Added File class support to file collection