diff --git a/components/zeosdbo/src/component/ZAbstractRODataset.pas b/components/zeosdbo/src/component/ZAbstractRODataset.pas
index 45ba7777..3c0e94b6 100644
--- a/components/zeosdbo/src/component/ZAbstractRODataset.pas
+++ b/components/zeosdbo/src/component/ZAbstractRODataset.pas
@@ -114,7 +114,7 @@ type
   end;
 
   {** Abstract dataset component optimized for read/only access. }
-  TZAbstractRODataset = class(TDataSet)
+  TZAbstractRODataset = class(TWideDataSet)
   private
 {$IFDEF VER130BELOW}
     FUniDirectional: Boolean;
@@ -338,8 +338,8 @@ type
   {$IFDEF WITH_IPROVIDER}
     procedure PSStartTransaction; override;
     procedure PSEndTransaction(Commit: Boolean); override;
-    {function PSGetTableName: string; override;
-    function PSGetQuoteChar: string; override; }
+    function PSGetTableNameW: WideString; override;
+    function PSGetQuoteCharW: WideString; override;
     function PSGetUpdateException(E: Exception;
       Prev: EUpdateError): EUpdateError; override;
     function PSIsSQLBased: Boolean; override;
@@ -348,7 +348,7 @@ type
     function PSUpdateRecord(UpdateKind: TUpdateKind;
       Delta: TDataSet): Boolean; override;
     procedure PSExecute; override;
-    {function PSGetKeyFields: string; override;}
+    function PSGetKeyFieldsW: WideString; override;
     function PSGetParams: TParams; override;
     procedure PSSetParams(AParams: TParams); override;
     function PSExecuteStatement(const ASQL: string; AParams: TParams;
@@ -2766,7 +2766,7 @@ end;
   Returns a string quote character.
   @retuns a quote character.
 }
-{function TZAbstractRODataset.PSGetQuoteChar: string;
+function TZAbstractRODataset.PSGetQuoteCharW: WideString;
 begin
   if Assigned(FConnection) then
   begin
@@ -2778,7 +2778,7 @@ begin
   end
   else
     Result := '"';
-end;}
+end;
 
 {**
   Checks if dataset can execute any commands?
@@ -2887,7 +2887,7 @@ end;
   @returns a table name or an empty string is SQL query is complex SELECT
     or not SELECT statement.
 }
-{function TZAbstractRODataset.PSGetTableName: string;
+function TZAbstractRODataset.PSGetTableNameW: WideString;
 var
   Driver: IZDriver;
   Tokenizer: IZTokenizer;
@@ -2905,16 +2905,16 @@ begin
     if Assigned(SelectSchema) and (SelectSchema.TableCount = 1) then
       Result := SelectSchema.Tables[0].FullName;
   end;
-end;}
+end;
 
 {**
   Defines a list of query primary key fields.
   @returns a semicolon delimited list of query key fields.
 }
-{function TZAbstractRODataset.PSGetKeyFields: string;
+function TZAbstractRODataset.PSGetKeyFieldsW: WideString;
 begin
-  Result := inherited PSGetKeyFields;
-end;}
+  Result := inherited PSGetKeyFieldsW;
+end;
 
 {**
   Executes a SQL statement with parameters.
diff --git a/components/zeosdbo/src/component/ZAbstractTable.pas b/components/zeosdbo/src/component/ZAbstractTable.pas
index 62c5fbf3..67540a40 100644
--- a/components/zeosdbo/src/component/ZAbstractTable.pas
+++ b/components/zeosdbo/src/component/ZAbstractTable.pas
@@ -75,7 +75,7 @@ type
   protected
   {$IFDEF WITH_IPROVIDER}
     function PSIsSQLBased: Boolean; override;
-    {function PSGetTableName: string; override;}
+    function PSGetTableNameW: WideString; override;
     procedure PSSetCommandText(const ACommandText: string); override;
   {$ENDIF}
 
@@ -118,10 +118,10 @@ end;
   Gets the name of the table.
   @returns the name of this table.
 }
-{function TZAbstractTable.PSGetTableName: string;
+function TZAbstractTable.PSGetTableNameW: WideString;
 begin
   Result := TableName;
-end;}
+end;
 
 {**
   Assignes a new name for this table.
diff --git a/components/zeosdbo/src/component/ZStoredProcedure.pas b/components/zeosdbo/src/component/ZStoredProcedure.pas
index b66cdf6f..115028e6 100644
--- a/components/zeosdbo/src/component/ZStoredProcedure.pas
+++ b/components/zeosdbo/src/component/ZStoredProcedure.pas
@@ -91,7 +91,7 @@ type
   {$IFDEF WITH_IPROVIDER}
     function PSIsSQLBased: Boolean; override;
     procedure PSExecute; override;
-    {function PSGetTableName: string; override;}
+    function PSGetTableNameW: WideString; override;
     procedure PSSetCommandText(const ACommandText: string); override;
   {$ENDIF}
 
@@ -353,10 +353,10 @@ end;
   Gets the name of the stored procedure.
   @returns the name of this stored procedure.
 }
-{function TZStoredProc.PSGetTableName: string;
+function TZStoredProc.PSGetTableNameW: WideString;
 begin
   Result := StoredProcName;
-end;}
+end;
 
 {**
   Executes this stored procedure.
diff --git a/components/zeosdbo/src/component/ZStreamBlob.pas b/components/zeosdbo/src/component/ZStreamBlob.pas
index e69dad57..ac51e65b 100644
--- a/components/zeosdbo/src/component/ZStreamBlob.pas
+++ b/components/zeosdbo/src/component/ZStreamBlob.pas
@@ -104,7 +104,7 @@ begin
   end;
 end;
 
-type THackedDataset = class(TDataset);
+type THackedDataset = class(TWideDataset);
 
 {**
   Destroys this object and cleanups the memory.