diff --git a/Deploy/buildlpx.cmd b/Deploy/buildlpx.cmd
index 55a3cc5..e9eba72 100644
--- a/Deploy/buildlpx.cmd
+++ b/Deploy/buildlpx.cmd
@@ -1,4 +1,4 @@
-@set version=6.7.0
+@set version=6.8.0
 @set zip="%ProgramFiles%\7-Zip\7z.exe"
 @set output="CsvLINQPadDriver.%version%.lpx6"
 
@@ -6,7 +6,7 @@ del %output%
 
 set releaseDir=..\bin\Release\netcoreapp3.1
 
-%zip% a -tzip -mx=9 "%output%" header.xml %releaseDir%\*.dll %releaseDir%\*Connection.png ..\README.md
+%zip% a -tzip -mx=9 "%output%" header.xml %releaseDir%\*.dll %releaseDir%\*Connection.png ..\README.md ..\LICENSE
 
 @echo Package %output% created.
 @pause
diff --git a/README.md b/README.md
index 5aab1d1..b254d93 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@
 * [Usage](#usage)
 * [Configuration Options](#configuration-options)
   * [General](#general)
+  * [Files](#files)
   * [Format](#format)
   * [Memory](#memory)
   * [Generation](#generation)
@@ -145,21 +146,28 @@ CSV context can be added to LINQPad 6 same way as any other context.
 
 - Click `Add connection`.
 - Select `CSV Context Driver` and click `Next`.
-- Enter CSV file names or Drag&Drop (Ctrl adds files) from Explorer. Optionally configure other options.
+- Enter CSV file names or Drag&Drop (`Ctrl` adds files) from Explorer. Optionally configure other options.
 - Query your data.
 
 ## Configuration Options ##
 
 ### General ###
 
-- **CSV files** - list of CSV files and directories. Type one file/dir per line or Drag&Drop (Ctrl adds files) from explorer. Supports special wildcards: `*` and `**`.
+- **CSV files** - list of CSV files and directories. Type one file/dir per line or Drag&Drop (`Ctrl` adds files) from explorer. Supports special wildcards: `*` and `**`.
   - `c:\x\*.csv` - all files in folder `c:\x`.
   - `c:\x\**.csv` - all files in folder `c:\x` and all sub-directories.
 
+- No BOM encoding - specifies encoding for files without [BOM](https://en.wikipedia.org/wiki/Byte_order_mark). `UTF-8` is default.
+
+### Files ###
+
+- Order by - specifies files sort order. Affects similar files order.
+
 ### Format ###
 
 - CSV separator - character used to separate columns in files. Can be `,`, `\t`, etc. Auto-detected if empty.
 - Ignore files with invalid format - files with strange content not similar to CSV format will be ignored.
+- Allow comments - lines starting with `#` will be ignored.
 
 ### Memory ###
 
@@ -170,7 +178,7 @@ CSV context can be added to LINQPad 6 same way as any other context.
 
 ### Generation ###
 
-- Generate single class for similar files - single class will be generated for similar files which allows to query them as single one. Might not work well for files with relations.
+- Generate single class for similar files - single class will be generated for similar files which allows to query them as a single one. Might not work well for files with relations.
 - String comparison - string comparison for `Equals` and `GetHashCode` methods.
 
 ### Relations ###
@@ -261,7 +269,7 @@ string this[int index] { get; set; }
 string this[string index] { get; set; }
 ```
 
-See below.
+See [properties access](#properties-access) below.
 
 > Relations are not participated.
 
@@ -299,7 +307,7 @@ Authors.First()
 
 ### Extension Methods ###
 
-Driver provides extension methods for converting string to nullable types:
+Driver provides extension methods for converting string to `T?`. `CultureInfo.InvariantCulture` is used by default.
 
 ```csharp
 // Bool.
@@ -311,6 +319,9 @@ int? ToInt(CultureInfo? cultureInfo = null);
 // Long.
 long? ToLong(CultureInfo? cultureInfo = null);
 
+// Float.
+float? ToFloat(CultureInfo? cultureInfo = null);
+
 // Double.
 double? ToDouble(CultureInfo? cultureInfo = null);
 
@@ -353,8 +364,9 @@ TimeSpan? ToTimeSpan(
 
 ## Known Issues ##
 
+- Default encoding for files without BOM is UTF-8.
 - Some strange Unicode characters in column names may cause errors in generated data context source code.
-- Writing changed objects back to CSV is not directly supported, there is no `SubmitChanges()` . But you can use LINQPad's `Util.WriteCsv`.
+- Writing changed objects back to CSV is not directly supported, there is no `SubmitChanges()`. But you can use LINQPad's `Util.WriteCsv`.
 - Similar files single class generation does not detect relations correctly. However, you can query over related multiple files.
 
 ## Authors ##
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs b/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs
index e65d4a7..a73ab5b 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs
@@ -33,24 +33,27 @@ private CsvCSharpCodeGenerator(string contextNameSpace, string contextTypeName,
             _properties = properties;
         }
 
+        public record TypeCodeResult(string TypeName, string Code, string CodeName, string FilePath);
+        public record Result(string Code, IReadOnlyCollection<IGrouping<string, TypeCodeResult>> CodeGroups);
+
         // ReSharper disable once RedundantAssignment
-        public static (string Code, IReadOnlyCollection<IGrouping<string, (string Type, string Code, string CodeName)>> CodeGroups)
-            GenerateCode(CsvDatabase db, ref string nameSpace, ref string typeName, ICsvDataContextDriverProperties props) =>
+        public static Result GenerateCode(CsvDatabase db, ref string nameSpace, ref string typeName, ICsvDataContextDriverProperties props) =>
             new CsvCSharpCodeGenerator(nameSpace, typeName = DefaultContextTypeName, props).GenerateSrcFile(db);
 
-        private (string, IReadOnlyCollection<IGrouping<string, (string Type, string Code, string CodeName)>>) GenerateSrcFile(CsvDatabase csvDatabase)
+        private Result GenerateSrcFile(CsvDatabase csvDatabase)
         {
             var csvTables = csvDatabase.Tables;
 
             var groups = csvTables
                     .Select(table => GenerateTableRowDataTypeClass(table, _properties.HideRelationsFromDump, _properties.StringComparison))
-                    .GroupBy(typeCode => typeCode.Type)
+                    .GroupBy(typeCode => typeCode.TypeName)
                     .ToImmutableList();
 
-            return ($@"using System;
-using System.Linq;
+            return new Result($@"using System;
 using System.Collections.Generic;
 
+using CsvLINQPadDriver;
+
 namespace {_contextNameSpace}
 {{
     /// <summary>CSV Data Context</summary>
@@ -67,6 +70,8 @@ public class {_contextTypeName} : {typeof(CsvDataContextBase).GetCodeTypeClassNa
                 {GetBoolConst(_properties.IsStringInternEnabled)},
                 {GetBoolConst(_properties.IsCacheEnabled)},
                 {table.CsvSeparator.AsValidCSharpCode()},
+                {nameof(NoBomEncoding)}.{_properties.NoBomEncoding},
+                {GetBoolConst(_properties.AllowComments)},
                 {table.FilePath.AsValidCSharpCode()},
                 new {typeof(CsvColumnInfoList<>).GetCodeTypeClassName(GetClassName(table))} {{
                     {string.Join(string.Empty, table.Columns.Select(c => $@"{{ {c.Index}, x => x.{c.CodeName} }}, "))}
@@ -88,12 +93,12 @@ static string GetBoolConst(bool val) =>
                 val ? "true" : "false";
         }
 
-        private static (string Type, string Code, string CodeName) GenerateTableRowDataTypeClass(CsvTable table, bool hideRelationsFromDump, StringComparison stringComparison)
+        private static TypeCodeResult GenerateTableRowDataTypeClass(CsvTable table, bool hideRelationsFromDump, StringComparison stringComparison)
         {
             var className = GetClassName(table);
             var properties = table.Columns.Select(GetPropertyName).ToImmutableList();
 
-            return (className, $@"
+            return new TypeCodeResult(className, $@"
     public sealed record {className} : {typeof(ICsvRowBase).GetCodeTypeClassName()}
     {{{string.Join(string.Empty, table.Columns.Select(csvColumn => $@"
         public string {GetPropertyName(csvColumn)} {{ get; set; }}"))}
@@ -106,7 +111,7 @@ public sealed record {className} : {typeof(ICsvRowBase).GetCodeTypeClassName()}
         [{typeof(HideFromDumpAttribute).GetCodeTypeClassName()}]" : string.Empty)}
         public IEnumerable<{csvRelation.TargetTable.GetCodeRowClassName()}> {csvRelation.CodeName} {{ get; set; }}")
             )}
-    }}", table.CodeName!);
+    }}", table.CodeName!, table.FilePath);
 
             static string GetPropertyName(ICsvNames csvColumn) =>
                 csvColumn.CodeName!;
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs
index be62790..cec62a4 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs
@@ -21,21 +21,26 @@ public abstract class CsvTableBase<TRow> : CsvTableBase, IEnumerable<TRow>
     {
         private static CsvRowMappingBase<TRow>? _cachedCsvRowMappingBase;
 
-        private char CsvSeparator { get; }
+        private readonly char _csvSeparator;
+        private readonly NoBomEncoding _noBomEncoding;
+        private readonly bool _allowComments;
 
-        protected string FilePath { get; }
+        protected readonly string FilePath;
 
-        protected CsvTableBase(bool isStringInternEnabled, char csvSeparator, string filePath, IEnumerable<CsvColumnInfo> propertiesInfo, Action<TRow> relationsInit)
+        protected CsvTableBase(bool isStringInternEnabled, char csvSeparator, NoBomEncoding noBomEncoding, bool allowComments, string filePath, IEnumerable<CsvColumnInfo> propertiesInfo, Action<TRow> relationsInit)
             : base(isStringInternEnabled)
         {
-            CsvSeparator = csvSeparator;
+            _csvSeparator = csvSeparator;
+            _noBomEncoding = noBomEncoding;
+            _allowComments = allowComments;
+
             FilePath = filePath;
 
             _cachedCsvRowMappingBase ??= new CsvRowMappingBase<TRow>(propertiesInfo, relationsInit);
         }
 
         protected IEnumerable<TRow> ReadData() =>
-            FileUtils.CsvReadRows(FilePath, CsvSeparator, IsStringInternEnabled, _cachedCsvRowMappingBase!);
+            FileUtils.CsvReadRows(FilePath, _csvSeparator, IsStringInternEnabled, _noBomEncoding, _allowComments, _cachedCsvRowMappingBase!);
 
         // ReSharper disable once UnusedMember.Global
         public abstract IEnumerable<TRow> WhereIndexed(Func<TRow, string> getProperty, string propertyName, params string[] values);
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs
index f4831c4..9599f7d 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs
@@ -7,8 +7,8 @@ namespace CsvLINQPadDriver.CodeGen
     internal class CsvTableEnumerable<TRow> : CsvTableBase<TRow>
         where TRow : ICsvRowBase, new()
     {
-        public CsvTableEnumerable(bool isStringInternEnabled, char csvSeparator, string filePath, IEnumerable<CsvColumnInfo> propertiesInfo, Action<TRow> relationsInit)
-            : base(isStringInternEnabled, csvSeparator, filePath, propertiesInfo, relationsInit)
+        public CsvTableEnumerable(bool isStringInternEnabled, char csvSeparator, NoBomEncoding noBomEncoding, bool allowComments, string filePath, IEnumerable<CsvColumnInfo> propertiesInfo, Action<TRow> relationsInit)
+            : base(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, filePath, propertiesInfo, relationsInit)
         {
         }
 
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs
index c33aee7..d867706 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs
@@ -10,12 +10,15 @@ public static CsvTableBase<TRow> CreateTable<TRow>(
             bool isStringInternEnabled,
             bool isCacheEnabled,
             char csvSeparator,
+            NoBomEncoding noBomEncoding,
+            bool allowComments,
             string filePath,
             IEnumerable<CsvColumnInfo> propertiesInfo,
             Action<TRow> relationsInit)
             where TRow : ICsvRowBase, new() =>
             isCacheEnabled
-                ? (CsvTableBase<TRow>)new CsvTableList<TRow>(isStringInternEnabled, csvSeparator, filePath, propertiesInfo, relationsInit)
-                : new CsvTableEnumerable<TRow>(isStringInternEnabled, csvSeparator, filePath, propertiesInfo, relationsInit);
+                // ReSharper disable once RedundantCast
+                ? (CsvTableBase<TRow>)new CsvTableList<TRow>(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, filePath, propertiesInfo, relationsInit)
+                : new CsvTableEnumerable<TRow>(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, filePath, propertiesInfo, relationsInit);
     }
 }
\ No newline at end of file
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs
index f120ac1..8b32dec 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs
@@ -12,8 +12,8 @@ internal class CsvTableList<TRow> : CsvTableBase<TRow>, IList<TRow>
         private readonly IDictionary<string, ILookup<string, TRow>> _indices = new Dictionary<string, ILookup<string, TRow>>();
         private readonly Lazy<IList<TRow>> _dataCache;
 
-        public CsvTableList(bool isStringInternEnabled, char csvSeparator, string filePath, IEnumerable<CsvColumnInfo> propertiesInfo, Action<TRow> relationsInit)
-            : base(isStringInternEnabled, csvSeparator, filePath, propertiesInfo, relationsInit) =>
+        public CsvTableList(bool isStringInternEnabled, char csvSeparator, NoBomEncoding noBomEncoding, bool allowComments, string filePath, IEnumerable<CsvColumnInfo> propertiesInfo, Action<TRow> relationsInit)
+            : base(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, filePath, propertiesInfo, relationsInit) =>
             _dataCache = new Lazy<IList<TRow>>(() => ReadData().Cache($"{typeof(TRow).Name}:{FilePath}"));
 
         private IList<TRow> DataCache =>
@@ -30,7 +30,7 @@ public override IEnumerable<TRow> WhereIndexed(Func<TRow, string> getProperty, s
                 _indices.Add(propertyName, propertyIndex);
             }
 
-            var result = values.SelectMany(value => propertyIndex[value]);
+            var result = values.SelectMany(value => propertyIndex![value]);
 
             return values.Length > 1 ? result.Distinct() : result;
         }
diff --git a/Src/CsvLINQPadDriver/ConnectionDialog.xaml b/Src/CsvLINQPadDriver/ConnectionDialog.xaml
index 4e3bcf8..c54d16b 100644
--- a/Src/CsvLINQPadDriver/ConnectionDialog.xaml
+++ b/Src/CsvLINQPadDriver/ConnectionDialog.xaml
@@ -2,22 +2,28 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
+    xmlns:wpf="clr-namespace:CsvLINQPadDriver.Wpf"
     Title="CSV Files Connection"
     Icon="Connection.ico"
     Background="{x:Static SystemColors.ControlBrush}"
-    Width="640"
-    Height="520"
+    Width="680"
+    Height="580"
     WindowStartupLocation="CenterScreen"
     FocusManager.FocusedElement="{Binding ElementName=FilesTextBox}"
     Loaded="ConnectionDialog_OnLoaded">
 
+    <Window.Resources>
+        <ObjectDataProvider x:Key="NoBomEncodingData" MethodName="GetValues" ObjectType="{x:Type wpf:NoBomEncodingEnumObjectDataSource}" />
+        <ObjectDataProvider x:Key="FilesOrderByData" MethodName="GetValues" ObjectType="{x:Type wpf:FilesOrderByEnumObjectDataSource}" />
+    </Window.Resources>
+
     <Window.CommandBindings>
         <CommandBinding
             Command="ApplicationCommands.Paste"
             Executed="PasteAndGoCommandBinding_OnExecuted"
             CanExecute="PasteAndGoCommandBinding_OnCanExecute"/>
         <CommandBinding
-            Command="ApplicationCommands.Help" 
+            Command="ApplicationCommands.Help"
             Executed="Help_OnExecuted"
             CanExecute="Help_OnCanExecute"/>
     </Window.CommandBindings>
@@ -34,13 +40,30 @@
         </Grid.RowDefinitions>
 
         <DockPanel Grid.Row="0">
-            <Label Padding="0,0,0,3" Focusable="False" Content="CSV _files. Drag&amp;Drop (Ctrl adds files) or type one file/directory per line" DockPanel.Dock="Top" Target="{Binding ElementName=FilesTextBox}" />
+            <DockPanel DockPanel.Dock="Top" LastChildFill="True" VerticalAlignment="Center" KeyboardNavigation.TabNavigation="Local">
+                <Label Padding="0,3,0,3" Content="CSV _files. Drag&amp;Drop (Ctrl adds files) or type one file/directory per line." DockPanel.Dock="Left" Target="{Binding ElementName=FilesTextBox}" />
+                <Label Padding="0,3,0,3" Content=" No _BOM encoding" DockPanel.Dock="Left" Target="{Binding ElementName=NoBomEncodingComboBox}" />
+                <TextBlock DockPanel.Dock="Right" Padding="6 3 3 0" KeyboardNavigation.TabIndex="2">
+                    <Hyperlink TextDecorations="" NavigateUri="https://en.wikipedia.org/wiki/Byte_order_mark" Command="ApplicationCommands.Help">
+                        <TextBlock Text="?" ToolTip="BOM on Wikipedia" />
+                    </Hyperlink>
+                </TextBlock>
+                <ComboBox
+                    Name="NoBomEncodingComboBox"
+                    Margin="3,0,0,3"
+                    ToolTip="Encoding for files without BOM"
+                    SelectedValue="{Binding NoBomEncoding}"
+                    SelectedValuePath="Item1"
+                    DisplayMemberPath="Item2"
+                    ItemsSource="{Binding Source={StaticResource NoBomEncodingData}}"
+                    KeyboardNavigation.TabIndex="1"/>
+            </DockPanel>
             <TextBox
             Name="FilesTextBox"
-            AcceptsReturn="True" 
+            AcceptsReturn="True"
             HorizontalScrollBarVisibility="Auto"
             VerticalScrollBarVisibility="Auto"
-            Text="{Binding Files, UpdateSourceTrigger=PropertyChanged}" 
+            Text="{Binding Files, UpdateSourceTrigger=PropertyChanged}"
             ToolTip="CSV files. Drag&amp;Drop (Ctrl adds files) or type one file per line. Supports mask '*.csv' or recursive '**.csv'"
             AllowDrop="True"
             PreviewDragEnter="FilesTextBox_DragEnter"
@@ -49,6 +72,20 @@
         </DockPanel>
 
         <StackPanel Grid.Row="1">
+            <GroupBox Header="Files">
+                <StackPanel Margin="2" Height="Auto">
+                    <DockPanel VerticalAlignment="Center">
+                        <Label Padding="0 3 4 0" Content="_Order by"/>
+                        <ComboBox
+                            ToolTip="Files sort order. Affects similar files order"
+                            SelectedValue="{Binding FilesOrderBy}"
+                            SelectedValuePath="Item1"
+                            DisplayMemberPath="Item2"
+                            ItemsSource="{Binding Source={StaticResource FilesOrderByData}}"
+                        />
+                    </DockPanel>
+                </StackPanel>
+            </GroupBox>
             <GroupBox Header="Format">
             <StackPanel Margin="2" Height="Auto">
                 <DockPanel VerticalAlignment="Center">
@@ -56,6 +93,7 @@
                     <TextBox MaxLength="6" MaxLines="1" Text="{Binding CsvSeparator}" ToolTip="Character used to separate columns in CSV file. Separator is auto-detected for each file if empty"/>
                 </DockPanel>
                 <CheckBox IsChecked="{Binding IgnoreInvalidFiles}" Content="Ignore files _with invalid format" ToolTip="Ignore files with invalid format"/>
+                <CheckBox IsChecked="{Binding AllowComments}" Content="_Allow comments" ToolTip="Ignore lines starting with #"/>
             </StackPanel>
             </GroupBox>
             <GroupBox Header="Memory">
@@ -73,8 +111,8 @@
                         <!-- ReSharper disable once MarkupAttributeTypo -->
                         <Label Padding="0 3 4 0" Content="S_tring comparison" DockPanel.Dock="Left" Target="{Binding ElementName=StringComparisonComboBox}"/>
                         <TextBlock DockPanel.Dock="Right" Padding="5 3 0 0" KeyboardNavigation.TabIndex="2">
-                            <Hyperlink TextDecorations="" NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.stringcomparison" Command="ApplicationCommands.Help">
-                                <TextBlock Text="?"/>  
+                            <Hyperlink TextDecorations="" NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.stringcomparison#fields" Command="ApplicationCommands.Help">
+                                <TextBlock Text="?" ToolTip="StringComparison on Microsoft Docs" />
                             </Hyperlink>
                         </TextBlock>
                         <ComboBox Name="StringComparisonComboBox"
diff --git a/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs b/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs
index 54a5295..c62be12 100644
--- a/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs
+++ b/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs
@@ -81,8 +81,10 @@ private void PasteAndGoCommandBinding_OnCanExecute(object sender, CanExecuteRout
             e.CanExecute = Clipboard.ContainsText(TextDataFormat.Text) ||
                            Clipboard.ContainsText(TextDataFormat.UnicodeText);
 
-        private void Help_OnExecuted(object sender, ExecutedRoutedEventArgs e) =>
-            Process.Start(new ProcessStartInfo(((Hyperlink)e.OriginalSource).NavigateUri.OriginalString){ UseShellExecute = true });
+        private void Help_OnExecuted(object sender, ExecutedRoutedEventArgs e)
+        {
+            using var process = Process.Start(new ProcessStartInfo(((Hyperlink) e.OriginalSource).NavigateUri.OriginalString) { UseShellExecute = true });
+        }
 
         private void Help_OnCanExecute(object sender, CanExecuteRoutedEventArgs e) =>
             e.CanExecute = true;
diff --git a/Src/CsvLINQPadDriver/CsvDataContextDriver.cs b/Src/CsvLINQPadDriver/CsvDataContextDriver.cs
index eebdaba..0c284ff 100644
--- a/Src/CsvLINQPadDriver/CsvDataContextDriver.cs
+++ b/Src/CsvLINQPadDriver/CsvDataContextDriver.cs
@@ -32,15 +32,16 @@ public override string GetConnectionDescription(IConnectionInfo cxInfo)
             var parsedFiles = FileUtils.EnumFiles(new CsvDataContextDriverProperties(cxInfo).ParsedFiles).ToImmutableList();
             var parsedFilesCount = parsedFiles.Count;
             var dateTime = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}";
+            var totalFilesSize = parsedFiles.GetHumanizedFileSize();
 
             return $"{FileUtils.GetLongestCommonPrefixPath(parsedFiles)}{GetFilesCountString()}";
 
             string GetFilesCountString() =>
                 parsedFilesCount switch
                 {
-                    0 => $"(no files, {dateTime})",
-                    1 => $" ({dateTime})",
-                    _ => $" ({"file".ToQuantity(parsedFilesCount)}, {dateTime})"
+                    0 => $"({dateTime}, no files)",
+                    1 => $" ({totalFilesSize}, {dateTime})",
+                    _ => $" ({dateTime}, {"file".ToQuantity(parsedFilesCount)}, {totalFilesSize})"
                 };
         }
 
diff --git a/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs b/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs
index f1b75e8..f2e13b9 100644
--- a/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs
+++ b/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs
@@ -34,10 +34,26 @@ public string Files
             set => SetValue(value);
         }
 
+        public FilesOrderBy FilesOrderBy
+        {
+            get => GetValue(FilesOrderBy.None);
+            set => SetValue(value);
+        }
+
+        public NoBomEncoding NoBomEncoding
+        {
+            get => GetValue(NoBomEncoding.UTF8);
+            set => SetValue(value);
+        }
+
+        public bool AllowComments
+        {
+            get => GetValue(false);
+            set => SetValue(value);
+        }
+
         public IEnumerable<string> ParsedFiles =>
-            Regex.Split(Files, @"[\r\n]+")
-                .GetFilesOnly()
-                .Distinct(StringComparer.InvariantCultureIgnoreCase);
+            Regex.Split(Files, @"[\r\n]+").GetFilesOnly();
 
         public string CsvSeparator
         {
diff --git a/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj b/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj
index f37fc58..094d772 100644
--- a/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj
+++ b/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj
@@ -24,11 +24,15 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/i2van/CsvLINQPadDriver</RepositoryUrl>
     <PackageIcon>NuGetIcon.png</PackageIcon>
-    <PackageReleaseNotes>Use C# 9.0 records for generated data objects.</PackageReleaseNotes>
+    <PackageReleaseNotes>Added encoding for files without BOM.
+Added files sorting.
+Added allow comments option.
+Added similar/total files sizes.
+    </PackageReleaseNotes>
     <Copyright>Copyright © Martin Dobroucký 2013-2014, Ivan Ivon 2021</Copyright>
-    <AssemblyVersion>6.7.0.0</AssemblyVersion>
-    <FileVersion>6.7.0.0</FileVersion>
-    <Version>6.7.0</Version>
+    <AssemblyVersion>6.8.0.0</AssemblyVersion>
+    <FileVersion>6.8.0.0</FileVersion>
+    <Version>6.8.0</Version>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <ApplicationIcon>Connection.ico</ApplicationIcon>
   </PropertyGroup>
@@ -59,8 +63,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="26.1.0" />
-    <PackageReference Include="Humanizer.Core" Version="2.8.26" />
+    <PackageReference Include="CsvHelper" Version="27.0.2" />
+    <PackageReference Include="Humanizer.Core" Version="2.9.9" />
     <PackageReference Include="LINQPad.Reference" Version="1.1.0" />
   </ItemGroup>
 
diff --git a/Src/CsvLINQPadDriver/DataDisplay/CsvRowMemberProvider.cs b/Src/CsvLINQPadDriver/DataDisplay/CsvRowMemberProvider.cs
index 10af44c..7b0a4b7 100644
--- a/Src/CsvLINQPadDriver/DataDisplay/CsvRowMemberProvider.cs
+++ b/Src/CsvLINQPadDriver/DataDisplay/CsvRowMemberProvider.cs
@@ -78,7 +78,7 @@ static bool IsMemberVisible(MemberInfo member) =>
                 ProvidersDataCache.Add(objectType, providerData);
             }
 
-            return new CsvRowMemberProvider(objectToDisplay, providerData);
+            return new CsvRowMemberProvider(objectToDisplay, providerData!);
 
             static bool IsSupportedType(Type objectType) =>
                 typeof(ICsvRowBase).IsAssignableFrom(objectType);
diff --git a/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs b/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs
index e4f2941..76f8ef4 100644
--- a/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs
+++ b/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs
@@ -28,6 +28,7 @@ private CsvDatabase CreateModel()
         {
             var files = FileUtils
                 .EnumFiles(_csvDataContextDriverProperties.ParsedFiles)
+                .OrderFiles(_csvDataContextDriverProperties.FilesOrderBy)
                 .ToImmutableList();
 
             var baseDir = FileUtils.GetLongestCommonPrefixPath(files);
@@ -64,8 +65,11 @@ IEnumerable<CsvTable> CreateTables()
                 foreach (var file in files.Where(File.Exists))
                 {
                     var csvSeparator = _csvDataContextDriverProperties.CsvSeparatorChar ?? FileUtils.CsvDetectSeparator(file);
+                    var noBomEncoding = _csvDataContextDriverProperties.NoBomEncoding;
+                    var allowComments = _csvDataContextDriverProperties.AllowComments;
 
-                    if (_csvDataContextDriverProperties.IgnoreInvalidFiles && !FileUtils.IsCsvFormatValid(file, csvSeparator))
+                    if (_csvDataContextDriverProperties.IgnoreInvalidFiles &&
+                        !FileUtils.IsCsvFormatValid(file, csvSeparator, noBomEncoding, allowComments))
                     {
                         continue;
                     }
@@ -74,7 +78,7 @@ IEnumerable<CsvTable> CreateTables()
                     var fileDir = (Path.GetDirectoryName($"{file.Remove(0, baseDir.Length)}x") ?? string.Empty).TrimStart(Path.DirectorySeparatorChar);
                     var codeName = CodeGenHelper.GetSafeCodeName(Path.GetFileNameWithoutExtension(fileName) + (string.IsNullOrWhiteSpace(fileDir) ? string.Empty : $"_{fileDir}"));
 
-                    var columns = FileUtils.CsvReadHeader(file, csvSeparator)
+                    var columns = FileUtils.CsvReadHeader(file, csvSeparator, noBomEncoding, allowComments)
                         .Select((value, index) => (value, index))
                         .Select(col => new CsvColumn(col.value ?? string.Empty, col.index)
                         {
@@ -87,7 +91,7 @@ IEnumerable<CsvTable> CreateTables()
                     {
                         CodeName    = codeName,
                         ClassName   = GetClassName(),
-                        DisplayName = $"{fileName}{(string.IsNullOrWhiteSpace(fileDir) ? string.Empty : $" in {fileDir}")} {FileUtils.GetHumanizedFileSize(file)}"
+                        DisplayName = $"{fileName}{(string.IsNullOrWhiteSpace(fileDir) ? string.Empty : $" in {fileDir}")} {file.GetHumanizedFileSize()}"
                     };
 
                     string? GetClassName()
@@ -195,8 +199,8 @@ where csvColumn.Name.EndsWith("id", IdsComparison)
             // t1.nameID -> names.ID
             // t1.nameID -> name.nameID
             // t1.nameID -> names.nameID
-            // t1.fishID -> fishes.fishID
-            // t1.fishID -> fishes.ID
+            // t1.bookID -> books.authorID
+            // t1.bookID -> books.ID
             var csvTableColumns = from csvTable in csvTables
                 let keyNamesForeign = GetTableForeignKeyPossibleNames(csvTable)
                 let keyNames = keyNamesForeign.Concat(new []{ "id" })
diff --git a/Src/CsvLINQPadDriver/FilesOrderBy.cs b/Src/CsvLINQPadDriver/FilesOrderBy.cs
new file mode 100644
index 0000000..706003f
--- /dev/null
+++ b/Src/CsvLINQPadDriver/FilesOrderBy.cs
@@ -0,0 +1,28 @@
+using System.ComponentModel;
+
+namespace CsvLINQPadDriver
+{
+    public enum FilesOrderBy
+    {
+        [Description("None")]
+        None,
+
+        [Description("Name (A to Z)")]
+        NameAsc,
+
+        [Description("Name (Z to A)")]
+        NameDesc,
+
+        [Description("Last write time (oldest to newest)")]
+        LastWriteTimeAsc,
+
+        [Description("Last write time (newest to oldest)")]
+        LastWriteTimeDesc,
+
+        [Description("Size (smallest to largest)")]
+        SizeAsc,
+
+        [Description("Size (largest to smallest)")]
+        SizeDesc
+    }
+}
diff --git a/Src/CsvLINQPadDriver/Helpers/FileUtils.cs b/Src/CsvLINQPadDriver/Helpers/FileUtils.cs
index c44baad..abda14f 100644
--- a/Src/CsvLINQPadDriver/Helpers/FileUtils.cs
+++ b/Src/CsvLINQPadDriver/Helpers/FileUtils.cs
@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 
 using Humanizer;
@@ -17,8 +18,39 @@ namespace CsvLINQPadDriver.Helpers
 {
     public static class FileUtils
     {
+        private const StringComparison FileNameComparison = StringComparison.OrdinalIgnoreCase;
+
+        private static readonly StringComparer FileNameComparer = StringComparer.OrdinalIgnoreCase;
         private static readonly Dictionary<string, string> StringInternCache = new();
 
+        private static readonly Lazy<IReadOnlyDictionary<NoBomEncoding, Encoding>> NoBomEncodings = new(CalculateNoBomEncodings);
+
+        [DllImport("kernel32.dll")]
+        private static extern int GetSystemDefaultLCID();
+
+        [DllImport("kernel32.dll")]
+        private static extern int GetUserDefaultLCID();
+
+        private static IReadOnlyDictionary<NoBomEncoding, Encoding> CalculateNoBomEncodings()
+        {
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
+            return new Dictionary<NoBomEncoding, Encoding>
+            {
+                [NoBomEncoding.UTF8]             = Encoding.UTF8,
+                [NoBomEncoding.Unicode]          = Encoding.Unicode,
+                [NoBomEncoding.BigEndianUnicode] = Encoding.BigEndianUnicode,
+                [NoBomEncoding.UTF32]            = Encoding.UTF32,
+                [NoBomEncoding.BigEndianUTF32]   = new UTF32Encoding(true, true),
+                [NoBomEncoding.ASCII]            = Encoding.ASCII,
+                [NoBomEncoding.SystemCodePage]   = GetCodePageEncoding(false),
+                [NoBomEncoding.UserCodePage]     = GetCodePageEncoding(true)
+            };
+
+            static Encoding GetCodePageEncoding(bool user) =>
+                Encoding.GetEncoding(CultureInfo.GetCultureInfo(user ? GetUserDefaultLCID() : GetSystemDefaultLCID()).TextInfo.ANSICodePage);
+        }
+
         private static string? StringIntern(string? str) =>
             str switch
             {
@@ -28,10 +60,10 @@ public static class FileUtils
                         : StringInternCache[str] = str
             };
 
-        public static IEnumerable<T> CsvReadRows<T>(string fileName, char csvSeparator, bool internString, CsvRowMappingBase<T> csvClassMap)
+        public static IEnumerable<T> CsvReadRows<T>(string fileName, char csvSeparator, bool internString, NoBomEncoding noBomEncoding, bool allowComments, CsvRowMappingBase<T> csvClassMap)
             where T : ICsvRowBase, new()
         {
-            return CsvReadRows(fileName, csvSeparator)
+            return CsvReadRows(fileName, csvSeparator, noBomEncoding, allowComments)
                 .Skip(1) // Skip header.
                 .Select(GetRecord);
 
@@ -49,9 +81,9 @@ T GetRecord(string?[] rowColumns)
             }
         }
 
-        private static IEnumerable<string[]> CsvReadRows(string fileName, char csvSeparator)
+        private static IEnumerable<string[]> CsvReadRows(string fileName, char csvSeparator, NoBomEncoding noBomEncoding, bool allowComments)
         {
-            using var csvParser = CreateCsvParser(fileName, csvSeparator);
+            using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments);
 
             while (csvParser.Read())
             {
@@ -62,14 +94,14 @@ private static IEnumerable<string[]> CsvReadRows(string fileName, char csvSepara
         public static string GetDefaultDrive() =>
             Path.GetPathRoot(Environment.SystemDirectory)!.ToLower();
 
-        public static IEnumerable<string> CsvReadHeader(string fileName, char csvSeparator)
+        public static IEnumerable<string> CsvReadHeader(string fileName, char csvSeparator, NoBomEncoding noBomEncoding, bool allowComments)
         {
-            using var csvParser = CreateCsvParser(fileName, csvSeparator);
+            using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments);
 
             return csvParser.Read() ? csvParser.Record : new string[0];
         }
 
-        public static bool IsCsvFormatValid(string fileName, char csvSeparator)
+        public static bool IsCsvFormatValid(string fileName, char csvSeparator, NoBomEncoding noBomEncoding, bool allowComments)
         {
             var header = $"{fileName} is not valid CSV file:";
 
@@ -82,7 +114,7 @@ public static bool IsCsvFormatValid(string fileName, char csvSeparator)
 
             try
             {
-                using var csvParser = CreateCsvParser(fileName, csvSeparator);
+                using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments);
 
                 if (!csvParser.Read())
                 {
@@ -190,47 +222,84 @@ public static string GetLongestCommonPrefixPath(IEnumerable<string> paths)
 
             return Enumerable.Range(1, filePaths.Length)
                 .Select(i => string.Join(Path.DirectorySeparatorChar, filePaths.Take(i).ToImmutableList()))
-                .LastOrDefault(prefix => pathsValid.All(path => path.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))) ?? string.Empty;
+                .LastOrDefault(prefix => pathsValid.All(path => path.StartsWith(prefix, FileNameComparison))) ?? string.Empty;
         }
 
         public static IEnumerable<string> EnumFiles(IEnumerable<string> paths) =>
             GetFilesOnly(paths)
                 .SelectMany(EnumFiles)
-                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .Distinct(FileNameComparer)
                 .ToImmutableList();
 
-        public static string GetHumanizedFileSize(string fileName)
+        public static string GetHumanizedFileSize(this string fileName) =>
+            GetHumanizedFileSize(GetFileSize(fileName));
+
+        public static string GetHumanizedFileSize(this IEnumerable<string> files) =>
+            GetHumanizedFileSize(files.Select(file => file).Sum(GetFileSize));
+
+        private static long GetFileSize(string fileName)
         {
             try
             {
-                return new FileInfo(fileName).Length.Bytes().Humanize("0.#");
+                return new FileInfo(fileName).Length;
             }
             catch (Exception exception)
             {
                 CsvDataContextDriver.WriteToLog($"Failed to get {fileName} size", exception);
-
-                return exception.Message;
+                return 0;
             }
         }
 
-        private static CsvParser CreateCsvParser(string fileName, char csvSeparator)
+        private static string GetHumanizedFileSize(long size) =>
+            size.Bytes().Humanize("0.#");
+
+        private static CsvParser CreateCsvParser(string fileName, char csvSeparator, NoBomEncoding noBomEncoding, bool allowComments)
         {
+            const int bufferSize = 4096 * 20;
+
             var csvConfiguration = new CsvConfiguration(CultureInfo.InvariantCulture)
             {
                 Delimiter = csvSeparator.ToString(),
+                AllowComments = allowComments,
                 HasHeaderRecord = false,
                 DetectColumnCountChanges = false,
-                BufferSize = 4096 * 20
+                BufferSize = bufferSize,
+                ProcessFieldBufferSize = bufferSize
             };
 
-            return new CsvParser(new StreamReader(fileName, Encoding.Default, true, csvConfiguration.BufferSize / sizeof(char)), csvConfiguration);
+            return new CsvParser(new StreamReader(fileName, NoBomEncodings.Value[noBomEncoding], true, bufferSize / sizeof(char)), csvConfiguration);
         }
 
         public static IEnumerable<string> GetFilesOnly(this IEnumerable<string> paths) =>
             paths
                 .Select(path => path.Trim())
                 .Where(path => !path.StartsWith("#"))
-                .Where(path => !string.IsNullOrWhiteSpace(path));
+                .Where(path => !string.IsNullOrWhiteSpace(path))
+                .Distinct(FileNameComparer);
+
+        public static IEnumerable<string> OrderFiles(this IEnumerable<string> files, FilesOrderBy filesOrderBy)
+        {
+            if (filesOrderBy == FilesOrderBy.None)
+            {
+                return files;
+            }
+
+            var fileInfos = files.Select(file => new FileInfo(file));
+
+            // ReSharper disable once SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault
+            fileInfos = filesOrderBy switch
+            {
+                FilesOrderBy.NameAsc => fileInfos.OrderBy(fileInfo => fileInfo.Name, FileNameComparer),
+                FilesOrderBy.NameDesc => fileInfos.OrderByDescending(fileInfo => fileInfo.Name, FileNameComparer),
+                FilesOrderBy.SizeAsc => fileInfos.OrderBy(fileInfo => fileInfo.Length),
+                FilesOrderBy.SizeDesc => fileInfos.OrderByDescending(fileInfo => fileInfo.Length),
+                FilesOrderBy.LastWriteTimeAsc => fileInfos.OrderBy(fileInfo => fileInfo.LastWriteTimeUtc),
+                FilesOrderBy.LastWriteTimeDesc => fileInfos.OrderByDescending(fileInfo => fileInfo.LastWriteTimeUtc),
+                _ => throw new ArgumentOutOfRangeException(nameof(filesOrderBy), filesOrderBy, $"Unknown {filesOrderBy}")
+            };
+
+            return fileInfos.Select(fileInfo => fileInfo.FullName);
+        }
 
         private static IEnumerable<string> EnumFiles(string path)
         {
diff --git a/Src/CsvLINQPadDriver/Helpers/StringExtensions.cs b/Src/CsvLINQPadDriver/Helpers/StringExtensions.cs
index 6c576ef..7afc1aa 100644
--- a/Src/CsvLINQPadDriver/Helpers/StringExtensions.cs
+++ b/Src/CsvLINQPadDriver/Helpers/StringExtensions.cs
@@ -18,6 +18,9 @@ public static class StringExtensions
         public static long? ToLong(this string? str, CultureInfo? cultureInfo = null) =>
             GetValueOrNull(long.TryParse(str, NumberStyles.Integer, SelectCulture(cultureInfo), out var parsedValue), parsedValue);
 
+        public static float? ToFloat(this string? str, CultureInfo? cultureInfo = null) =>
+            GetValueOrNull(float.TryParse(str, NumberStyles.Float | NumberStyles.AllowThousands, SelectCulture(cultureInfo), out var parsedValue), parsedValue);
+
         public static double? ToDouble(this string? str, CultureInfo? cultureInfo = null) =>
             GetValueOrNull(double.TryParse(str, NumberStyles.Float | NumberStyles.AllowThousands, SelectCulture(cultureInfo), out var parsedValue), parsedValue);
 
@@ -69,6 +72,7 @@ private static CultureInfo SelectCulture(CultureInfo? cultureInfo) =>
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static T? GetValueOrNull<T>(bool converted, T value) where T: struct =>
+            // ReSharper disable once RedundantCast
             converted ? value : (T?)null;
     }
 }
diff --git a/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs b/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs
index 1f6cce2..291a28c 100644
--- a/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs
+++ b/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs
@@ -15,6 +15,21 @@ public interface ICsvDataContextDriverProperties
         /// </summary>
         string Files { get; set; }
 
+        /// <summary>
+        /// Files order by.
+        /// </summary>
+        FilesOrderBy FilesOrderBy { get; set; }
+
+        /// <summary>
+        /// Files without BOM encoding.
+        /// </summary>
+        NoBomEncoding NoBomEncoding { get; set; }
+
+        /// <summary>
+        /// Allow CSV comments.
+        /// </summary>
+        bool AllowComments { get; set; }
+
         public IEnumerable<string> ParsedFiles { get; }
 
         /// <summary>
diff --git a/Src/CsvLINQPadDriver/NoBomEncoding.cs b/Src/CsvLINQPadDriver/NoBomEncoding.cs
new file mode 100644
index 0000000..de87c5c
--- /dev/null
+++ b/Src/CsvLINQPadDriver/NoBomEncoding.cs
@@ -0,0 +1,23 @@
+using System.ComponentModel;
+
+namespace CsvLINQPadDriver
+{
+    public enum NoBomEncoding
+    {
+        [Description("UTF-8")]
+        UTF8,
+        [Description("UTF-16")]
+        Unicode,
+        [Description("UTF-16 Big Endian")]
+        BigEndianUnicode,
+        [Description("UTF-32")]
+        UTF32,
+        [Description("UTF-32 Big Endian")]
+        BigEndianUTF32,
+        ASCII,
+        [Description("System сode page")]
+        SystemCodePage,
+        [Description("User сode page")]
+        UserCodePage
+    }
+}
diff --git a/Src/CsvLINQPadDriver/SchemaBuilder.cs b/Src/CsvLINQPadDriver/SchemaBuilder.cs
index 23f5c75..6dbc162 100644
--- a/Src/CsvLINQPadDriver/SchemaBuilder.cs
+++ b/Src/CsvLINQPadDriver/SchemaBuilder.cs
@@ -8,6 +8,7 @@
 
 using CsvLINQPadDriver.CodeGen;
 using CsvLINQPadDriver.DataModel;
+using CsvLINQPadDriver.Helpers;
 
 using LINQPad.Extensibility.DataContext;
 
@@ -50,11 +51,12 @@ internal static List<ExplorerItem> GetSchemaAndBuildAssembly(ICsvDataContextDriv
             {
                 foreach (var tableCodeGroup in tableCodeGroups.Where(codeGroup => codeGroup.Count() > 1))
                 {
-                    var codeNames = tableCodeGroup.Select(g => g.CodeName).ToImmutableList();
+                    var codeNames = tableCodeGroup.Select(typeCodeResult => typeCodeResult.CodeName).ToImmutableList();
+                    var similarFilesSize = tableCodeGroup.Select(typeCodeResult => typeCodeResult.FilePath).GetHumanizedFileSize();
 
                     var total = $"({codeNames.Count} of {csvDatabase.Files.Count})";
 
-                    schema.Insert(index++, new ExplorerItem($"{codeNames.First()} similar files {total} joined data", ExplorerItemKind.Schema, ExplorerIcon.View)
+                    schema.Insert(index++, new ExplorerItem($"{codeNames.First()} similar files {total} joined data ({similarFilesSize})", ExplorerItemKind.Schema, ExplorerIcon.View)
                     {
                         ToolTipText = $"Drag&drop similar files {total} joined data to text window{Environment.NewLine}{Environment.NewLine}" +
                                       $"{string.Join(Environment.NewLine, codeNames.Count <= 3 ? codeNames : codeNames.Take(2).Concat(new []{ "..." }).Concat(codeNames.Skip(codeNames.Count-1)))}",
diff --git a/Src/CsvLINQPadDriver/Wpf/EnumObjectDataSource.cs b/Src/CsvLINQPadDriver/Wpf/EnumObjectDataSource.cs
new file mode 100644
index 0000000..7f4cc8d
--- /dev/null
+++ b/Src/CsvLINQPadDriver/Wpf/EnumObjectDataSource.cs
@@ -0,0 +1,19 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+
+namespace CsvLINQPadDriver.Wpf
+{
+    internal abstract class EnumObjectDataSource<T> where T: Enum
+    {
+        // ReSharper disable once UnusedMethodReturnValue.Global
+        public Tuple<T, string>[] GetValues() =>
+            Enum.GetValues(typeof(T)).OfType<T>().Select(value =>
+            {
+                var valueAsString = value.ToString();
+                var fieldInfo = typeof(T).GetField(valueAsString);
+                var descriptionAttributes = (DescriptionAttribute[])fieldInfo!.GetCustomAttributes(typeof(DescriptionAttribute), true);
+                return Tuple.Create(value, descriptionAttributes.Any() ? descriptionAttributes.First().Description : valueAsString);
+            }).ToArray();
+    }
+}
diff --git a/Src/CsvLINQPadDriver/Wpf/FilesOrderByEnumObjectDataSource.cs b/Src/CsvLINQPadDriver/Wpf/FilesOrderByEnumObjectDataSource.cs
new file mode 100644
index 0000000..5536471
--- /dev/null
+++ b/Src/CsvLINQPadDriver/Wpf/FilesOrderByEnumObjectDataSource.cs
@@ -0,0 +1,6 @@
+namespace CsvLINQPadDriver.Wpf
+{
+    internal class FilesOrderByEnumObjectDataSource : EnumObjectDataSource<FilesOrderBy>
+    {
+    }
+}
diff --git a/Src/CsvLINQPadDriver/Wpf/NoBomEncodingEnumObjectDataSource.cs b/Src/CsvLINQPadDriver/Wpf/NoBomEncodingEnumObjectDataSource.cs
new file mode 100644
index 0000000..40cbf1a
--- /dev/null
+++ b/Src/CsvLINQPadDriver/Wpf/NoBomEncodingEnumObjectDataSource.cs
@@ -0,0 +1,6 @@
+namespace CsvLINQPadDriver.Wpf
+{
+    internal class NoBomEncodingEnumObjectDataSource : EnumObjectDataSource<NoBomEncoding>
+    {
+    }
+}
diff --git a/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj b/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj
index 41e38f4..e9b2339 100644
--- a/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj
+++ b/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj
@@ -24,10 +24,14 @@
     <None Remove="LPRun\CSV\Authors2.csv" />
     <None Remove="LPRun\CSV\Books.csv" />
     <None Remove="LPRun\CSV\Books2.csv" />
+    <None Remove="LPRun\CSV\Comments.csv" />
+    <None Remove="LPRun\CSV\Encoding\Utf8Cp65001.csv" />
     <None Remove="LPRun\LINQPad.Runtime.dll" />
     <None Remove="LPRun\LINQPad.Runtime.runtimeconfig.json" />
     <None Remove="LPRun\LPRun6-x86.exe" />
     <None Remove="LPRun\LPRun6.exe" />
+    <None Remove="LPRun\Templates\Comments.linq" />
+    <None Remove="LPRun\Templates\Encoding.linq" />
     <None Remove="LPRun\Templates\Extensions.linq" />
     <None Remove="LPRun\Templates\Generation.linq" />
     <None Remove="LPRun\Templates\Relations.linq" />
@@ -60,6 +64,18 @@
     <Content Include="LPRun\CSV\Books2.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="LPRun\CSV\Comments.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="LPRun\CSV\Encoding\Utf8Cp65001.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="LPRun\Templates\Encoding.linq">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="LPRun\Templates\Comments.linq">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="LPRun\Templates\StringComparison.linq">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -79,9 +95,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Bin/LINQPad.Runtime.dll b/Tests/CsvLINQPadDriverTest/LPRun/Bin/LINQPad.Runtime.dll
index 0cea698..81ea30d 100644
Binary files a/Tests/CsvLINQPadDriverTest/LPRun/Bin/LINQPad.Runtime.dll and b/Tests/CsvLINQPadDriverTest/LPRun/Bin/LINQPad.Runtime.dll differ
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6-x86.exe b/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6-x86.exe
index 5cbc5e7..e7a3121 100644
Binary files a/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6-x86.exe and b/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6-x86.exe differ
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6.exe b/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6.exe
index 6798b4d..9014cf8 100644
Binary files a/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6.exe and b/Tests/CsvLINQPadDriverTest/LPRun/Bin/LPRun6.exe differ
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/CSV/Comments.csv b/Tests/CsvLINQPadDriverTest/LPRun/CSV/Comments.csv
new file mode 100644
index 0000000..27d126c
--- /dev/null
+++ b/Tests/CsvLINQPadDriverTest/LPRun/CSV/Comments.csv
@@ -0,0 +1,3 @@
+column
+#comment
+value
\ No newline at end of file
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/CSV/Encoding/Utf8Cp65001.csv b/Tests/CsvLINQPadDriverTest/LPRun/CSV/Encoding/Utf8Cp65001.csv
new file mode 100644
index 0000000..7cf2038
--- /dev/null
+++ b/Tests/CsvLINQPadDriverTest/LPRun/CSV/Encoding/Utf8Cp65001.csv
@@ -0,0 +1,2 @@
+encoding,кодировка,الترميز,编码,コーディング
+encoding,кодировка,الترميز,编码,コーディング
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/ConnectionHeader.cs b/Tests/CsvLINQPadDriverTest/LPRun/ConnectionHeader.cs
index f337e4c..ad15abc 100644
--- a/Tests/CsvLINQPadDriverTest/LPRun/ConnectionHeader.cs
+++ b/Tests/CsvLINQPadDriverTest/LPRun/ConnectionHeader.cs
@@ -9,7 +9,7 @@ namespace CsvLINQPadDriverTest.LPRun
 {
     internal static class ConnectionHeader
     {
-        public static string Get<T>(string driverAssemblyName, string driverNamespace, T driverConfig)
+        public static string Get<T>(string driverAssemblyName, string driverNamespace, T driverConfig, params string[] additionalNamespaces)
             where T : notnull =>
             $@"<Query Kind=""Statements"">
   <Connection>
@@ -19,7 +19,7 @@ public static string Get<T>(string driverAssemblyName, string driverNamespace, T
     </DriverData>
   </Connection>
   <NuGetReference>FluentAssertions</NuGetReference>
-  <Namespace>FluentAssertions</Namespace>
+{string.Join(Environment.NewLine, new[] { "FluentAssertions" }.Concat(additionalNamespaces).Select(additionalNamespace => $"  <Namespace>{additionalNamespace}</Namespace>"))}
 </Query>";
 
         private static IEnumerable<(string Key, string Value)> GetKeyValues<T>(T driverConfig)
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Driver.cs b/Tests/CsvLINQPadDriverTest/LPRun/Driver.cs
index 8b9bcbc..69393ef 100644
--- a/Tests/CsvLINQPadDriverTest/LPRun/Driver.cs
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Driver.cs
@@ -8,7 +8,7 @@ internal static class Driver
     {
         public static void Install(string driverDir, params string[] files)
         {
-            string driverPath = Path.Combine(Context.GetExeFullPath(@"drivers\DataContext\NetCore"), driverDir);
+            var driverPath = Path.Combine(Context.GetExeFullPath(@"drivers\DataContext\NetCore"), driverDir);
 
             Directory.CreateDirectory(driverPath);
 
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Runner.cs b/Tests/CsvLINQPadDriverTest/LPRun/Runner.cs
index cb77e62..813827d 100644
--- a/Tests/CsvLINQPadDriverTest/LPRun/Runner.cs
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Runner.cs
@@ -13,59 +13,53 @@ public static Result Execute(string linqFile, TimeSpan waitForExit)
             var output = new StringBuilder();
             var error = new StringBuilder();
 
-            Process? process = null;
-
-            try
+            using var process = new Process
             {
-                process = new Process
+                StartInfo = new ProcessStartInfo(Context.Exe, Context.GetFullPath(linqFile))
                 {
-                    StartInfo = new ProcessStartInfo(Context.Exe, Context.GetFullPath(linqFile))
-                    {
-                        CreateNoWindow = true,
-                        UseShellExecute = false,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true
-                    },
-                    EnableRaisingEvents = true
-                };
+                    CreateNoWindow = true,
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true
+                }
+            };
 
-                process.OutputDataReceived += OutputDataReceivedHandler;
-                process.ErrorDataReceived += ErrorDataReceivedHandler;
+            process.OutputDataReceived += OutputDataReceivedHandler;
+            process.ErrorDataReceived += ErrorDataReceivedHandler;
 
-                process.Start();
+            process.Start();
 
-                process.BeginOutputReadLine();
-                process.BeginErrorReadLine();
+            process.BeginOutputReadLine();
+            process.BeginErrorReadLine();
 
-                var completed = process.WaitForExit((int) waitForExit.TotalMilliseconds);
+            var completed = process.WaitForExit((int) waitForExit.TotalMilliseconds);
 
-                process.OutputDataReceived -= OutputDataReceivedHandler;
-                process.ErrorDataReceived -= ErrorDataReceivedHandler;
+            process.CancelOutputRead();
+            process.CancelErrorRead();
 
-                if (completed)
-                {
-                    return new Result(output.ToString(), error.ToString(), process.ExitCode);
-                }
+            process.OutputDataReceived -= OutputDataReceivedHandler;
+            process.ErrorDataReceived -= ErrorDataReceivedHandler;
+
+            if (completed)
+            {
+                return new Result(output.ToString(), error.ToString(), process.ExitCode);
+            }
 
-                process.Kill();
+            process.Kill();
 
-                throw new TimeoutException($"LPRun timed out for {waitForExit}");
+            throw new TimeoutException($"LPRun timed out for {waitForExit}");
 
-                void OutputDataReceivedHandler(object _, DataReceivedEventArgs e) =>
-                    output.Append(e.Data);
+            void OutputDataReceivedHandler(object _, DataReceivedEventArgs e) =>
+                output.Append(e.Data);
 
-                void ErrorDataReceivedHandler(object _, DataReceivedEventArgs e)
+            void ErrorDataReceivedHandler(object _, DataReceivedEventArgs e)
+            {
+                if (e.Data?.StartsWith("Downloading NuGet package") == false &&
+                    e.Data?.StartsWith("Restoring package") == false)
                 {
-                    if (e.Data?.StartsWith("Downloading NuGet package") == false && e.Data?.StartsWith("Restoring package") == false)
-                    {
-                        error.Append(e.Data);
-                    }
+                    error.Append(e.Data);
                 }
             }
-            finally
-            {
-                process?.Close();
-            }
         }
     }
 }
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Comments.linq b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Comments.linq
new file mode 100644
index 0000000..35d2427
--- /dev/null
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Comments.linq
@@ -0,0 +1 @@
+Comments.Should().HaveCount(context.ExpectedCount, Reason());
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Encoding.linq b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Encoding.linq
new file mode 100644
index 0000000..5da1dde
--- /dev/null
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Encoding.linq
@@ -0,0 +1,19 @@
+var properties = new []
+{
+	"encoding", "кодировка", "الترميز", "编码", "コーディング"
+};
+
+var data = new []
+{
+	Utf16BomCp1200_Encoding,
+	Utf16BomCp1201_Encoding,
+	Utf8BomCp65001_Encoding,
+	Utf8Cp65001_Encoding,
+	Utf32Bom_Encoding
+}.SelectMany(_ => _).ToList();
+
+data.Distinct().Should().HaveCount(1, Reason());
+
+data.SelectMany(row => properties.Select(property => row[property] == property))
+	.Should()
+	.OnlyContain(trueValue => trueValue, Reason());
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Extensions.linq b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Extensions.linq
index 03124fd..445b8ac 100644
--- a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Extensions.linq
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Extensions.linq
@@ -1,4 +1,5 @@
 var invalidString = "This is invalid string";
+string nullString = null;
 
 // Bool.
 "0".ToBool().Should().BeFalse(Reason());
@@ -9,22 +10,32 @@ var invalidString = "This is invalid string";
 "true".ToBool().Should().BeTrue(Reason());
 
 invalidString.ToBool().Should().BeNull(Reason());
+nullString.ToBool().Should().BeNull(Reason());
 
 // Int.
 "1".ToInt().Should().Be(1, Reason());
 invalidString.ToInt().Should().BeNull(Reason());
+nullString.ToInt().Should().BeNull(Reason());
 
 // Long.
 "1".ToLong().Should().Be(1L, Reason());
 invalidString.ToLong().Should().BeNull(Reason());
+nullString.ToLong().Should().BeNull(Reason());
+
+// Float.
+"1.23".ToFloat().Should().Be(1.23f, Reason());
+invalidString.ToFloat().Should().BeNull(Reason());
+nullString.ToFloat().Should().BeNull(Reason());
 
 // Double.
 "1.23".ToDouble().Should().Be(1.23, Reason());
 invalidString.ToDouble().Should().BeNull(Reason());
+nullString.ToDouble().Should().BeNull(Reason());
 
 // Decimal.
 "1".ToDecimal().Should().Be(1m, Reason());
 invalidString.ToDecimal().Should().BeNull(Reason());
+nullString.ToDecimal().Should().BeNull(Reason());
 
 // Guid.
 var expectedGuid = Guid.NewGuid();
@@ -41,6 +52,10 @@ invalidString.ToGuid().Should().BeNull(Reason());
 invalidString.ToGuid(guidFormat).Should().BeNull(Reason());
 invalidString.ToGuid(guidFormats).Should().BeNull(Reason());
 
+nullString.ToGuid().Should().BeNull(Reason());
+nullString.ToGuid(guidFormat).Should().BeNull(Reason());
+nullString.ToGuid(guidFormats).Should().BeNull(Reason());
+
 // DateTime.
 var expectedDateTime = new DateTime(1978, 9, 30, 3, 11, 51);
 var dateTimeFormat = @"yyyy-MM-dd hh\:mm\:ss";
@@ -56,6 +71,10 @@ invalidString.ToDateTime().Should().BeNull(Reason());
 invalidString.ToDateTime(dateTimeFormat).Should().BeNull(Reason());
 invalidString.ToDateTime(dateTimeFormats).Should().BeNull(Reason());
 
+nullString.ToDateTime().Should().BeNull(Reason());
+nullString.ToDateTime(dateTimeFormat).Should().BeNull(Reason());
+nullString.ToDateTime(dateTimeFormats).Should().BeNull(Reason());
+
 // TimeSpan.
 var expectedTimeSpan = new TimeSpan(9, 12, 34, 56);
 var timeSpanFormat = @"d\:hh\:mm\:ss";
@@ -70,3 +89,7 @@ timeSpanString.ToTimeSpan(timeSpanFormats).Should().Be(expectedTimeSpan, Reason(
 invalidString.ToTimeSpan().Should().BeNull(Reason());
 invalidString.ToTimeSpan(timeSpanFormat).Should().BeNull(Reason());
 invalidString.ToTimeSpan(timeSpanFormats).Should().BeNull(Reason());
+
+nullString.ToTimeSpan().Should().BeNull(Reason());
+nullString.ToTimeSpan(timeSpanFormat).Should().BeNull(Reason());
+nullString.ToTimeSpan(timeSpanFormats).Should().BeNull(Reason());
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Generation.linq b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Generation.linq
index 9d67a45..470370e 100644
--- a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Generation.linq
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Generation.linq
@@ -62,4 +62,7 @@ new Action(() => copy[3] = "")
 	.WithMessage("There is no property *3*", Reason());
 
 // Generate single class for similar files.
-Authors.First().GetType().Equals(Authors2.First().GetType()).Should().Be(context.UseSingleClassForSameFiles, Reason());
+Authors.First().GetType()
+	.Equals(Authors2.First().GetType())
+	.Should()
+	.Be(context.UseSingleClassForSameFiles, Reason());
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Relations.linq b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Relations.linq
index 6b8f1e6..475547b 100644
--- a/Tests/CsvLINQPadDriverTest/LPRun/Templates/Relations.linq
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Templates/Relations.linq
@@ -2,7 +2,7 @@ var actual =
 	from book in Books
 	join author in Authors on book.AuthorId equals author.Id
 	select (author.Name, book.Title);
-	
+
 var expected = new[]
 {
 	("Author 1", "Author 1 Book 1"),
@@ -12,5 +12,8 @@ var expected = new[]
 
 actual.Should().BeEquivalentTo(expected, Reason());
 
-Array.ForEach(Authors.ToArray(), author => author.Books.Should().BeEquivalentTo(Books.Where(book => book.AuthorId == author.Id), Reason()));
-Array.ForEach(Books.ToArray(), book => book.Authors.Should().BeEquivalentTo(Authors.Where(author => author.Id == book.AuthorId), Reason()));
+Authors.ToList().ForEach(
+	author => author.Books.Should().BeEquivalentTo(Books.Where(book => book.AuthorId == author.Id), Reason()));
+
+Books.ToList().ForEach(
+	book => book.Authors.Should().BeEquivalentTo(Authors.Where(author => author.Id == book.AuthorId), Reason()));
diff --git a/Tests/CsvLINQPadDriverTest/LPRun/Templates/StringComparison.linq b/Tests/CsvLINQPadDriverTest/LPRun/Templates/StringComparison.linq
index 4e21c20..6b31bb3 100644
--- a/Tests/CsvLINQPadDriverTest/LPRun/Templates/StringComparison.linq
+++ b/Tests/CsvLINQPadDriverTest/LPRun/Templates/StringComparison.linq
@@ -4,4 +4,8 @@ var copy = original with { Title = original.Title.ToUpper() };
 var expectedEquality = original.Title.Equals(copy.Title, context.StringComparison);
 
 original.Equals(copy).Should().Be(expectedEquality, Reason());
-original.GetHashCode().Equals(copy.GetHashCode()).Should().Be(expectedEquality, Reason());
+
+original.GetHashCode()
+	.Equals(copy.GetHashCode())
+	.Should()
+	.Be(expectedEquality, Reason());
diff --git a/Tests/CsvLINQPadDriverTest/LPRunTests.cs b/Tests/CsvLINQPadDriverTest/LPRunTests.cs
index b70bdce..2ced872 100644
--- a/Tests/CsvLINQPadDriverTest/LPRunTests.cs
+++ b/Tests/CsvLINQPadDriverTest/LPRunTests.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Text;
+
 using FluentAssertions;
 
 using Moq;
@@ -17,18 +18,43 @@ namespace CsvLINQPadDriverTest
     [TestFixture]
     public class LPRunTests
     {
-        private static readonly string Files = Context.GetCsvFullPath("*.csv");
-        private static readonly string[] ParsedFiles = { Files };
+        private static readonly string Files = Context.GetCsvFullPath("**.csv");
 
         [OneTimeSetUp]
-        public void Init() =>
-            Driver.Install("CsvLINQPadDriver", "CsvHelper.dll", "CsvLINQPadDriver.dll", "Humanizer.dll");
+        public void Init()
+        {
+            Driver.Install("CsvLINQPadDriver",
+                "CsvLINQPadDriver.dll",
+                "CsvHelper.dll",
+                "Humanizer.dll"
+            );
+
+            CreateEncodingFiles();
+
+            static void CreateEncodingFiles()
+            {
+                var contents = File.ReadAllText(GetFilePath("Utf8Cp65001"), Encoding.Default);
+
+                Array.ForEach(GetEncodings().ToArray(), fileEncoding => File.WriteAllText(GetFilePath(fileEncoding.FileName), contents, fileEncoding.Encoding));
+
+                static IEnumerable<(string FileName, Encoding Encoding)> GetEncodings()
+                {
+                    yield return ("Utf16BomCp1200", Encoding.Unicode);
+                    yield return ("Utf16BomCp1201", Encoding.BigEndianUnicode);
+                    yield return ("Utf8BomCp65001", Encoding.UTF8);
+                    yield return ("Utf32Bom",       Encoding.UTF32);
+                }
+
+                static string GetFilePath(string fileName) =>
+                    Context.GetCsvFullPath(Path.Combine("Encoding", $"{fileName}.csv"));
+            }
+        }
 
         [Test]
         [TestCaseSource(nameof(TestsData))]
-        public void Execute_ScriptWithDriverProperties_Success((string linqScriptName, string? context, ICsvDataContextDriverProperties driverProperties) testsData)
+        public void Execute_ScriptWithDriverProperties_Success((string linqScriptName, string? context, ICsvDataContextDriverProperties driverProperties) testData)
         {
-            var (linqScriptName, context, driverProperties) = testsData;
+            var (linqScriptName, context, driverProperties) = testData;
 
             var queryConfig = GetQueryHeaders().Aggregate(new StringBuilder(), (stringBuilder, h) =>
             {
@@ -38,6 +64,9 @@ public void Execute_ScriptWithDriverProperties_Success((string linqScriptName, s
             }).ToString();
 
             var linqScript = LinqScript.Create($"{linqScriptName}.linq", queryConfig);
+
+            Console.Write($"{linqScript}{Environment.NewLine}{Environment.NewLine}{queryConfig}");
+
             var (output, error, exitCode) = Runner.Execute(linqScript, TimeSpan.FromMinutes(2));
 
             if (!string.IsNullOrWhiteSpace(output))
@@ -50,8 +79,8 @@ public void Execute_ScriptWithDriverProperties_Success((string linqScriptName, s
 
             IEnumerable<string> GetQueryHeaders()
             {
-                yield return ConnectionHeader.Get("CsvLINQPadDriver", "CsvLINQPadDriver.CsvDataContextDriver", driverProperties!);
-                yield return @"string Reason([System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0) => $""something went wrong at line #{sourceLineNumber}"";";
+                yield return ConnectionHeader.Get("CsvLINQPadDriver", "CsvLINQPadDriver.CsvDataContextDriver", driverProperties!, "System.Runtime.CompilerServices");
+                yield return @"string Reason([CallerLineNumber] int sourceLineNumber = 0) => $""something went wrong at line #{sourceLineNumber}"";";
                 if (!string.IsNullOrWhiteSpace(context))
                 {
                     yield return $"var context = {context};";
@@ -73,37 +102,42 @@ IEnumerable<string> GetQueryHeaders()
             };
 
             var multipleDriverPropertiesTestData = GetCsvDataContextDriverProperties()
-                    .SelectMany(driverProperties =>
-                        linqScriptNames.Select(linqScriptName =>
-                            (linqScriptName, 
-                             $"new {{ {nameof(driverProperties.UseSingleClassForSameFiles)} = {driverProperties.UseSingleClassForSameFiles.ToString().ToLowerInvariant()} }}",
-                             driverProperties)));
+                .SelectMany(driverProperties =>
+                    linqScriptNames.Select(linqScriptName =>
+                        (linqScriptName, 
+                         $"new {{ {nameof(driverProperties.UseSingleClassForSameFiles)} = {driverProperties.UseSingleClassForSameFiles.ToString().ToLowerInvariant()} }}",
+                         driverProperties)));
 
             var singleDriverPropertiesTestData = new[] { "Extensions", "SimilarFilesRelations" }
-                    .Select(linqFile =>
-                        (linqFile, 
-                         noContext,
-                         defaultCsvDataContextDriverProperties));
+                .Select(linqFile =>
+                    (linqFile, 
+                     noContext,
+                     defaultCsvDataContextDriverProperties));
 
             var stringComparisonDriverPropertiesTestData = ((StringComparison[])Enum.GetValues(typeof(StringComparison)))
-                .Select(stringComparison =>
-                    ("StringComparison", 
-                     $"new {{ {nameof(defaultCsvDataContextDriverProperties.StringComparison)} = {nameof(StringComparison)}.{stringComparison} }}",
-                     GetDefaultCsvDataContextDriverPropertiesObject(stringComparison)));
+                .SelectMany(stringComparison =>
+                    new [] { "StringComparison", "Encoding" }.Select(linqFile =>
+                        (linqFile,
+                         $"new {{ {nameof(defaultCsvDataContextDriverProperties.StringComparison)} = {nameof(StringComparison)}.{stringComparison} }}",
+                         GetDefaultCsvDataContextDriverPropertiesObject(stringComparison))));
+
+            var allowCommentsTestData = new[] { true, false }
+                .Select(allowComments =>
+                        ("Comments",
+                         $"new {{ ExpectedCount = {(allowComments ? 1 : 2)} }}",
+                         GetDefaultCsvDataContextDriverPropertiesObject(defaultStringComparison, allowComments)));
 
             return multipleDriverPropertiesTestData
                     .Concat(singleDriverPropertiesTestData!)
+                    .Concat(allowCommentsTestData!)
                     .Concat(stringComparisonDriverPropertiesTestData)!;
 
             IEnumerable<ICsvDataContextDriverProperties> GetCsvDataContextDriverProperties()
             {
                 yield return defaultCsvDataContextDriverProperties;
 
-                yield return GetCsvDataContextDriverPropertiesObject(csvDataContextDriverProperties =>
+                yield return Mock.Of<ICsvDataContextDriverProperties>(csvDataContextDriverProperties =>
                     csvDataContextDriverProperties.Files == Files &&
-                    csvDataContextDriverProperties.ParsedFiles == ParsedFiles &&
-                    csvDataContextDriverProperties.CsvSeparator == "," &&
-                    csvDataContextDriverProperties.CsvSeparatorChar == ',' &&
                     csvDataContextDriverProperties.DebugInfo &&
                     csvDataContextDriverProperties.DetectRelations &&
                     csvDataContextDriverProperties.UseSingleClassForSameFiles == false &&
@@ -112,30 +146,22 @@ IEnumerable<ICsvDataContextDriverProperties> GetCsvDataContextDriverProperties()
                     csvDataContextDriverProperties.IgnoreInvalidFiles == false &&
                     csvDataContextDriverProperties.IsCacheEnabled == false &&
                     csvDataContextDriverProperties.HideRelationsFromDump == false &&
-                    csvDataContextDriverProperties.Persist == false
-                );
+                    csvDataContextDriverProperties.Persist == false);
             }
 
-            static ICsvDataContextDriverProperties GetDefaultCsvDataContextDriverPropertiesObject(StringComparison stringComparison) =>
-                GetCsvDataContextDriverPropertiesObject(csvDataContextDriverProperties =>
+            static ICsvDataContextDriverProperties GetDefaultCsvDataContextDriverPropertiesObject(StringComparison stringComparison, bool allowComments = false) =>
+                Mock.Of<ICsvDataContextDriverProperties>(csvDataContextDriverProperties =>
                     csvDataContextDriverProperties.Files == Files &&
-                    csvDataContextDriverProperties.ParsedFiles == ParsedFiles &&
-                    csvDataContextDriverProperties.CsvSeparator == "," &&
-                    csvDataContextDriverProperties.CsvSeparatorChar == ',' &&
                     csvDataContextDriverProperties.DebugInfo &&
                     csvDataContextDriverProperties.DetectRelations &&
                     csvDataContextDriverProperties.UseSingleClassForSameFiles &&
+                    csvDataContextDriverProperties.AllowComments == allowComments &&
                     csvDataContextDriverProperties.StringComparison == stringComparison &&
                     csvDataContextDriverProperties.IsStringInternEnabled &&
                     csvDataContextDriverProperties.IgnoreInvalidFiles &&
                     csvDataContextDriverProperties.IsCacheEnabled &&
                     csvDataContextDriverProperties.HideRelationsFromDump &&
-                    csvDataContextDriverProperties.Persist
-                );
-
-            static ICsvDataContextDriverProperties GetCsvDataContextDriverPropertiesObject(
-                Expression<Func<ICsvDataContextDriverProperties, bool>> predicate) =>
-                Mock.Of(predicate, MockBehavior.Strict);
+                    csvDataContextDriverProperties.Persist);
         }
     }
 }