Index: oup/current/FileClasses/_Extensions.pas
===================================================================
--- oup/current/FileClasses/_Extensions.pas	(revision 229)
+++ oup/current/FileClasses/_Extensions.pas	(revision 231)
@@ -2,4 +2,7 @@
 
 interface
+
+uses
+  _FileTypes;
 
 type
Index: oup/current/FileClasses/_FileTypes.pas
===================================================================
--- oup/current/FileClasses/_FileTypes.pas	(revision 229)
+++ oup/current/FileClasses/_FileTypes.pas	(revision 231)
@@ -11,8 +11,5 @@
     protected
       FConnectionID: Integer;
-      FFileID: Integer;
-      FFileName: String;
-      FFileExt: String;
-      FFileSize: Integer;
+      FFileInfo: TFileInfo;
       FFileStream: TMemoryStream;
 
@@ -45,8 +42,5 @@
 
       property FileStream: TMemoryStream read FFileStream;
-      property FileID: Integer read FFileID;
-      property FileName: String read FFileName;
-      property FileExt: String read FFileExt;
-      property FileSize: Integer read FFileSize;
+      property FileInfo: TFileInfo read FFileInfo;
       property ConnectionID: Integer read FConnectionID;
 
@@ -84,13 +78,7 @@
 
 constructor TFile.Create(ConnectionID, FileID: Integer);
-var
-  fileinfo: TFileInfo;
 begin
   FConnectionID := ConnectionID;
-  FFileID := FileID;
-  fileinfo := ConManager.Connection[ConnectionID].GetFileInfo(FileID);
-  FFileName := fileinfo.Name;
-  FFileExt := fileinfo.Extension;
-  FFileSize := fileinfo.Size;
+  FFileInfo := ConManager.Connection[ConnectionID].GetFileInfo(FileID);
 
   FCached := False;
@@ -235,5 +223,5 @@
 procedure TFile.InitDatLinks;
 begin
-  FDatLinks := ConManager.Connection[FConnectionID].GetDatLinks(FFileID);
+  FDatLinks := ConManager.Connection[FConnectionID].GetDatLinks(FFileInfo.ID);
 end;
 
@@ -245,5 +233,5 @@
 procedure TFile.InitRawList;
 begin
-  FRawParts := ConManager.Connection[FConnectionID].GetRawList(FFileID);
+  FRawParts := ConManager.Connection[FConnectionID].GetRawList(FFileInfo.ID);
 end;