diff --git a/AmalgamationTool/DynamORM.Amalgamation.cs b/AmalgamationTool/DynamORM.Amalgamation.cs
index 9d47c3d..43015a6 100644
--- a/AmalgamationTool/DynamORM.Amalgamation.cs
+++ b/AmalgamationTool/DynamORM.Amalgamation.cs
@@ -3857,6 +3857,7 @@ namespace DynamORM
             { typeof(char), DbType.StringFixedLength },
             { typeof(Guid), DbType.Guid },
             { typeof(DateTime), DbType.DateTime },
+            { typeof(TimeSpan), DbType.Time },
             { typeof(DateTimeOffset), DbType.DateTimeOffset },
             { typeof(byte[]), DbType.Binary },
             { typeof(byte?), DbType.Byte },
@@ -3874,6 +3875,7 @@ namespace DynamORM
             { typeof(char?), DbType.StringFixedLength },
             { typeof(Guid?), DbType.Guid },
             { typeof(DateTime?), DbType.DateTime },
+            { typeof(TimeSpan?), DbType.Time },
             { typeof(DateTimeOffset?), DbType.DateTimeOffset }
         };
 
diff --git a/DynamORM/Builders/Implementation/DynamicInsertQueryBuilder.cs b/DynamORM/Builders/Implementation/DynamicInsertQueryBuilder.cs
index 3bb8223..8926af5 100644
--- a/DynamORM/Builders/Implementation/DynamicInsertQueryBuilder.cs
+++ b/DynamORM/Builders/Implementation/DynamicInsertQueryBuilder.cs
@@ -196,7 +196,7 @@ namespace DynamORM.Builders.Implementation
                         DynamicPropertyInvoker propMap = mapper.ColumnsMap.TryGetValue(colName.ToLower());
 
                         if (propMap == null || propMap.Column == null || !propMap.Column.IsNoInsert)
-                            Insert(colName, con.Value);
+                            Insert(colName, con.Value); // TODO: This probably should get value from mapper
                     }
             }
             else
diff --git a/DynamORM/DynamORM.csproj b/DynamORM/DynamORM.csproj
index f34d405..7b5a50c 100644
--- a/DynamORM/DynamORM.csproj
+++ b/DynamORM/DynamORM.csproj
@@ -6,7 +6,7 @@
 		<Copyright>Copyright © RUSSEK Software 2012-2023</Copyright>
 		<Company>RUSSEK Software</Company>
 		<Authors>Grzegorz Russek</Authors>
-		<VersionPrefix>1.5</VersionPrefix>
+		<VersionPrefix>1.6</VersionPrefix>
 		<RepositoryUrl>https://git.dr4cul4.pl/RUSSEK-Software/DynamORM</RepositoryUrl>
 		<PackageProjectUrl>https://dr4cul4.pl</PackageProjectUrl>
 		<Product>DynamORM</Product>
diff --git a/DynamORM/DynamicExtensions.cs b/DynamORM/DynamicExtensions.cs
index ed7762b..c9b4858 100644
--- a/DynamORM/DynamicExtensions.cs
+++ b/DynamORM/DynamicExtensions.cs
@@ -67,6 +67,7 @@ namespace DynamORM
             { typeof(char), DbType.StringFixedLength },
             { typeof(Guid), DbType.Guid },
             { typeof(DateTime), DbType.DateTime },
+            { typeof(TimeSpan), DbType.Time },
             { typeof(DateTimeOffset), DbType.DateTimeOffset },
             { typeof(byte[]), DbType.Binary },
             { typeof(byte?), DbType.Byte },
@@ -84,7 +85,8 @@ namespace DynamORM
             { typeof(char?), DbType.StringFixedLength },
             { typeof(Guid?), DbType.Guid },
             { typeof(DateTime?), DbType.DateTime },
-            { typeof(DateTimeOffset?), DbType.DateTimeOffset }
+            { typeof(TimeSpan?), DbType.Time },
+            { typeof(DateTimeOffset?), DbType.DateTimeOffset },
         };
 
         #endregion Type column map