diff --git a/Samples/FSObj2Doc_VCL/Obj2DocTest.dfm b/Samples/FSObj2Doc_VCL/Obj2DocTest.dfm
index 777551d..65ead12 100644
--- a/Samples/FSObj2Doc_VCL/Obj2DocTest.dfm
+++ b/Samples/FSObj2Doc_VCL/Obj2DocTest.dfm
@@ -85,7 +85,7 @@ object frmObj2Doc: TfrmObj2Doc
     Text = ''
   end
   object btnGetDocs: TButton
-    Left = 676
+    Left = 1084
     Top = 700
     Width = 238
     Height = 39
@@ -93,6 +93,7 @@ object frmObj2Doc: TfrmObj2Doc
     Margins.Top = 4
     Margins.Right = 4
     Margins.Bottom = 4
+    Anchors = [akTop, akRight]
     Caption = 'Get Documents'
     TabOrder = 2
     OnClick = btnGetDocsClick
@@ -100,12 +101,13 @@ object frmObj2Doc: TfrmObj2Doc
   object lstDocID: TListBox
     Left = 29
     Top = 700
-    Width = 619
+    Width = 1047
     Height = 370
     Margins.Left = 4
     Margins.Top = 4
     Margins.Right = 4
     Margins.Bottom = 4
+    Anchors = [akLeft, akTop, akBottom]
     ItemHeight = 20
     TabOrder = 3
     OnClick = lstDocIDClick
@@ -187,7 +189,7 @@ object frmObj2Doc: TfrmObj2Doc
     end
     object lblMyArrTime: TLabel
       Left = 140
-      Top = 293
+      Top = 366
       Width = 90
       Height = 20
       Margins.Left = 4
@@ -225,7 +227,7 @@ object frmObj2Doc: TfrmObj2Doc
         'Gamma')
     end
     object edtArrStr0: TEdit
-      Left = 124
+      Left = 126
       Top = 295
       Width = 189
       Height = 28
@@ -420,14 +422,15 @@ object frmObj2Doc: TfrmObj2Doc
     end
   end
   object btnInstallListener: TButton
-    Left = 924
-    Top = 700
-    Width = 211
+    Left = 1084
+    Top = 747
+    Width = 238
     Height = 39
     Margins.Left = 4
     Margins.Top = 4
     Margins.Right = 4
     Margins.Bottom = 4
+    Anchors = [akTop, akRight]
     Caption = 'Install Listener'
     TabOrder = 6
     OnClick = btnInstallListenerClick
diff --git a/Samples/FSObj2Doc_VCL/Obj2DocTest.pas b/Samples/FSObj2Doc_VCL/Obj2DocTest.pas
index 6dee65f..bab12e3 100644
--- a/Samples/FSObj2Doc_VCL/Obj2DocTest.pas
+++ b/Samples/FSObj2Doc_VCL/Obj2DocTest.pas
@@ -106,7 +106,7 @@ implementation
 
 uses
   System.IniFiles, System.IOUtils,
-  FB4D.Firestore, FB4D.Document, FB4D.Helpers;
+  FB4D.Firestore, FB4D.Document, FB4D.Helpers, FB4D.Configuration;
 
 const
   cDocs = 'Docs';
@@ -175,6 +175,7 @@ procedure TfrmObj2Doc.FormCreate(Sender: TObject);
   finally
     IniFile.Free;
   end;
+  Caption := Caption + ' [' + TFirebaseConfiguration.GetLibVersionInfo + ']';
 end;
 
 function TfrmObj2Doc.GetSettingFileName: string;
@@ -374,7 +375,7 @@ procedure TfrmObj2Doc.OnChangedDocument(ChangedDoc: IFirestoreDocument);
       lstDocIDClick(nil);
   end else
     lstDocID.AddItem(ChangedDoc.DocumentName(false),
-      TMyFSDoc.LoadObjectFromDocument(ChangedDoc));
+      TMyFSDoc.LoadObjectFromDocument(ChangedDoc, GetOptions));
 end;
 
 procedure TfrmObj2Doc.OnDeletedDocument(const DeletedDocPath: string;