diff --git a/docs/mdsource/query-usage.source.md b/docs/mdsource/query-usage.source.md
index 4e77b3664..345d53209 100644
--- a/docs/mdsource/query-usage.source.md
+++ b/docs/mdsource/query-usage.source.md
@@ -54,7 +54,31 @@ All where statements require a `path`. This is a full path to a, possible nested
 
 #### Supported Types
 
-[String](https://docs.microsoft.com/en-us/dotnet/api/system.string), [Guid](https://docs.microsoft.com/en-us/dotnet/api/system.guid), [Double](https://docs.microsoft.com/en-us/dotnet/api/system.double), [Boolean](https://docs.microsoft.com/en-us/dotnet/api/system.boolean), [Float](https://docs.microsoft.com/en-us/dotnet/api/system.float), [Byte](https://docs.microsoft.com/en-us/dotnet/api/system.byte), [DateTime](https://docs.microsoft.com/en-us/dotnet/api/system.datetime), [DateTimeOffset](https://docs.microsoft.com/en-us/dotnet/api/system.datetimeoffset), [Decimal](https://docs.microsoft.com/en-us/dotnet/api/system.decimal), [Int16](https://docs.microsoft.com/en-us/dotnet/api/system.int16), [Int32](https://docs.microsoft.com/en-us/dotnet/api/system.int32), [Int64](https://docs.microsoft.com/en-us/dotnet/api/system.int64), [UInt16](https://docs.microsoft.com/en-us/dotnet/api/system.uint16), [UInt32](https://docs.microsoft.com/en-us/dotnet/api/system.uint32), [UInt64](https://docs.microsoft.com/en-us/dotnet/api/system.uint64), and [Enum](https://docs.microsoft.com/en-us/dotnet/api/system.enum).
+[String](https://docs.microsoft.com/en-us/dotnet/api/system.string), [Guid](https://docs.microsoft.com/en-us/dotnet/api/system.guid), [Double](https://docs.microsoft.com/en-us/dotnet/api/system.double), [Boolean](https://docs.microsoft.com/en-us/dotnet/api/system.boolean), [Float](https://docs.microsoft.com/en-us/dotnet/api/system.float), [Byte](https://docs.microsoft.com/en-us/dotnet/api/system.byte), [DateTime](https://docs.microsoft.com/en-us/dotnet/api/system.datetime), [DateOnly](https://docs.microsoft.com/en-us/dotnet/api/system.dateonly), [TimeOnly](https://docs.microsoft.com/en-us/dotnet/api/system.timeonly), [DateTimeOffset](https://docs.microsoft.com/en-us/dotnet/api/system.datetimeoffset), [Decimal](https://docs.microsoft.com/en-us/dotnet/api/system.decimal), [Int16](https://docs.microsoft.com/en-us/dotnet/api/system.int16), [Int32](https://docs.microsoft.com/en-us/dotnet/api/system.int32), [Int64](https://docs.microsoft.com/en-us/dotnet/api/system.int64), [UInt16](https://docs.microsoft.com/en-us/dotnet/api/system.uint16), [UInt32](https://docs.microsoft.com/en-us/dotnet/api/system.uint32), [UInt64](https://docs.microsoft.com/en-us/dotnet/api/system.uint64), and [Enum](https://docs.microsoft.com/en-us/dotnet/api/system.enum).
+
+
+##### TimeOnly query
+
+```
+{
+  timeEntities (where: {path: 'Property', comparison: equal, value: '10:11 AM'})
+  {
+    id
+  }
+}
+```
+
+
+##### DateOnly query
+
+```
+{
+  dateEntities (where: {path: 'Property', comparison: equal, value: '2020-10-1'})
+  {
+    id
+  }
+}
+```
 
 
 #### Supported Comparisons
diff --git a/docs/query-usage.md b/docs/query-usage.md
index ba20f0d1f..727775fe7 100644
--- a/docs/query-usage.md
+++ b/docs/query-usage.md
@@ -61,7 +61,31 @@ All where statements require a `path`. This is a full path to a, possible nested
 
 #### Supported Types
 
-[String](https://docs.microsoft.com/en-us/dotnet/api/system.string), [Guid](https://docs.microsoft.com/en-us/dotnet/api/system.guid), [Double](https://docs.microsoft.com/en-us/dotnet/api/system.double), [Boolean](https://docs.microsoft.com/en-us/dotnet/api/system.boolean), [Float](https://docs.microsoft.com/en-us/dotnet/api/system.float), [Byte](https://docs.microsoft.com/en-us/dotnet/api/system.byte), [DateTime](https://docs.microsoft.com/en-us/dotnet/api/system.datetime), [DateTimeOffset](https://docs.microsoft.com/en-us/dotnet/api/system.datetimeoffset), [Decimal](https://docs.microsoft.com/en-us/dotnet/api/system.decimal), [Int16](https://docs.microsoft.com/en-us/dotnet/api/system.int16), [Int32](https://docs.microsoft.com/en-us/dotnet/api/system.int32), [Int64](https://docs.microsoft.com/en-us/dotnet/api/system.int64), [UInt16](https://docs.microsoft.com/en-us/dotnet/api/system.uint16), [UInt32](https://docs.microsoft.com/en-us/dotnet/api/system.uint32), [UInt64](https://docs.microsoft.com/en-us/dotnet/api/system.uint64), and [Enum](https://docs.microsoft.com/en-us/dotnet/api/system.enum).
+[String](https://docs.microsoft.com/en-us/dotnet/api/system.string), [Guid](https://docs.microsoft.com/en-us/dotnet/api/system.guid), [Double](https://docs.microsoft.com/en-us/dotnet/api/system.double), [Boolean](https://docs.microsoft.com/en-us/dotnet/api/system.boolean), [Float](https://docs.microsoft.com/en-us/dotnet/api/system.float), [Byte](https://docs.microsoft.com/en-us/dotnet/api/system.byte), [DateTime](https://docs.microsoft.com/en-us/dotnet/api/system.datetime), [DateOnly](https://docs.microsoft.com/en-us/dotnet/api/system.dateonly), [TimeOnly](https://docs.microsoft.com/en-us/dotnet/api/system.timeonly), [DateTimeOffset](https://docs.microsoft.com/en-us/dotnet/api/system.datetimeoffset), [Decimal](https://docs.microsoft.com/en-us/dotnet/api/system.decimal), [Int16](https://docs.microsoft.com/en-us/dotnet/api/system.int16), [Int32](https://docs.microsoft.com/en-us/dotnet/api/system.int32), [Int64](https://docs.microsoft.com/en-us/dotnet/api/system.int64), [UInt16](https://docs.microsoft.com/en-us/dotnet/api/system.uint16), [UInt32](https://docs.microsoft.com/en-us/dotnet/api/system.uint32), [UInt64](https://docs.microsoft.com/en-us/dotnet/api/system.uint64), and [Enum](https://docs.microsoft.com/en-us/dotnet/api/system.enum).
+
+
+##### TimeOnly query
+
+```
+{
+  timeEntities (where: {path: 'Property', comparison: equal, value: '10:11 AM'})
+  {
+    id
+  }
+}
+```
+
+
+##### DateOnly query
+
+```
+{
+  dateEntities (where: {path: 'Property', comparison: equal, value: '2020-10-1'})
+  {
+    id
+  }
+}
+```
 
 
 #### Supported Comparisons
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c70f70980..dc2bdf56d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU5104;CS1573</NoWarn>
-    <Version>21.2.0</Version>
+    <Version>21.3.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
     <ImplicitUsings>true</ImplicitUsings>
diff --git a/src/GraphQL.EntityFramework/Where/ExpressionBuilder.cs b/src/GraphQL.EntityFramework/Where/ExpressionBuilder.cs
index cabf35126..db28a92c4 100644
--- a/src/GraphQL.EntityFramework/Where/ExpressionBuilder.cs
+++ b/src/GraphQL.EntityFramework/Where/ExpressionBuilder.cs
@@ -119,7 +119,14 @@ static Expression ProcessList(string path, Comparison comparison, string?[]? val
             .MakeGenericType(listItemType)
             .GetMethods(BindingFlags.Public | BindingFlags.Static)
             .Single(m => m.Name == "BuildPredicate" && m.GetParameters().Length == 5)
-            .Invoke(new(), new object[] { listPath, comparison, values!, false, stringComparison! })!;
+            .Invoke(new(), new object[]
+            {
+                listPath,
+                comparison,
+                values!,
+                false,
+                stringComparison!
+            })!;
 
         // Generate a method info for the Any Enumerable Static Method
         var anyInfo = typeof(Enumerable)
@@ -142,7 +149,7 @@ static Expression GetExpression(string path, Comparison comparison, string?[]? v
             {
                 case Comparison.NotIn:
                     WhereValidator.ValidateString(comparison, stringComparison);
-                    expressionBody = NegateExpression(MakeStringListInComparison(values!, property, stringComparison));  // Ensure expression is negated
+                    expressionBody = NegateExpression(MakeStringListInComparison(values!, property, stringComparison)); // Ensure expression is negated
                     break;
                 case Comparison.In:
                     WhereValidator.ValidateString(comparison, stringComparison);
@@ -162,7 +169,7 @@ static Expression GetExpression(string path, Comparison comparison, string?[]? v
             {
                 case Comparison.NotIn:
                     WhereValidator.ValidateObject(property.PropertyType, comparison, stringComparison);
-                    expressionBody = NegateExpression(MakeObjectListInComparision(values!, property)); // Ensure expression is negated
+                    expressionBody = NegateExpression(MakeObjectListInComparision(values!, property));
                     break;
                 case Comparison.In:
                     WhereValidator.ValidateObject(property.PropertyType, comparison, stringComparison);
diff --git a/src/GraphQL.EntityFramework/Where/TypeConverter.cs b/src/GraphQL.EntityFramework/Where/TypeConverter.cs
index b6b741de4..5d2675ef4 100644
--- a/src/GraphQL.EntityFramework/Where/TypeConverter.cs
+++ b/src/GraphQL.EntityFramework/Where/TypeConverter.cs
@@ -115,6 +115,24 @@ static IList ConvertStringsToListInternal(IEnumerable<string> values, Type type)
             return values.Select(_ => (DateTime?)DateTime.Parse(_)).ToList();
         }
 
+        if (type == typeof(Time))
+        {
+            return values.Select(Time.Parse).ToList();
+        }
+        if (type == typeof(Time?))
+        {
+            return values.Select(_ => (Time?)Time.Parse(_)).ToList();
+        }
+
+        if (type == typeof(Date))
+        {
+            return values.Select(_ => Date.ParseExact(_, "yyyy-MM-dd")).ToList();
+        }
+        if (type == typeof(Date?))
+        {
+            return values.Select(_ => (Date?)Date.ParseExact(_, "yyyy-MM-dd")).ToList();
+        }
+
         if (type == typeof(DateTimeOffset))
         {
             return values.Select(DateTimeOffset.Parse).ToList();
@@ -151,6 +169,16 @@ static IList ConvertStringsToListInternal(IEnumerable<string> values, Type type)
             return ValueConverter.ConvertTo<DateTime>(value);
         }
 
+        if (type == typeof(Date))
+        {
+            return ValueConverter.ConvertTo<Date>(value);
+        }
+
+        if (type == typeof(Time))
+        {
+            return ValueConverter.ConvertTo<Time>(value);
+        }
+
         if (type == typeof(DateTimeOffset))
         {
             return ValueConverter.ConvertTo<DateTimeOffset>(value);
diff --git a/src/Tests/Converters/DateConverter.cs b/src/Tests/Converters/DateConverter.cs
new file mode 100644
index 000000000..f64f2eb96
--- /dev/null
+++ b/src/Tests/Converters/DateConverter.cs
@@ -0,0 +1,8 @@
+public class DateConverter : Microsoft.EntityFrameworkCore.Storage.ValueConversion.ValueConverter<Date, DateTime>
+{
+    public DateConverter() : base(
+        d => d.ToDateTime(Time.MinValue),
+        d => Date.FromDateTime(d))
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Tests/Converters/NullableDateConverter.cs b/src/Tests/Converters/NullableDateConverter.cs
new file mode 100644
index 000000000..671b57649
--- /dev/null
+++ b/src/Tests/Converters/NullableDateConverter.cs
@@ -0,0 +1,12 @@
+public class NullableDateConverter : Microsoft.EntityFrameworkCore.Storage.ValueConversion.ValueConverter<Date?, DateTime?>
+{
+    public NullableDateConverter() : base(
+        d => d == null
+            ? null
+            : new DateTime?(d.Value.ToDateTime(Time.MinValue)),
+        d => d == null
+            ? null
+            : new Date?(Date.FromDateTime(d.Value)))
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Tests/Converters/NullableTimeConverter.cs b/src/Tests/Converters/NullableTimeConverter.cs
new file mode 100644
index 000000000..f04849b48
--- /dev/null
+++ b/src/Tests/Converters/NullableTimeConverter.cs
@@ -0,0 +1,8 @@
+public class NullableTimeConverter : Microsoft.EntityFrameworkCore.Storage.ValueConversion.ValueConverter<Time?, TimeSpan?>
+{
+    public NullableTimeConverter() : base(
+        t => t == null ? null : new TimeSpan?(t.Value.ToTimeSpan()),
+        t => t == null ? null : new Time?(Time.FromTimeSpan(t.Value)))
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Tests/Converters/TimeConverter.cs b/src/Tests/Converters/TimeConverter.cs
new file mode 100644
index 000000000..ae56812e6
--- /dev/null
+++ b/src/Tests/Converters/TimeConverter.cs
@@ -0,0 +1,8 @@
+public class TimeConverter : Microsoft.EntityFrameworkCore.Storage.ValueConversion.ValueConverter<Time, TimeSpan>
+{
+    public TimeConverter() : base(
+        t => t.ToTimeSpan(),
+        t => Time.FromTimeSpan(t))
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/Graphs/DateEntity.cs b/src/Tests/IntegrationTests/Graphs/DateEntity.cs
new file mode 100644
index 000000000..52c1ebe19
--- /dev/null
+++ b/src/Tests/IntegrationTests/Graphs/DateEntity.cs
@@ -0,0 +1,5 @@
+public class DateEntity
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public Date? Property { get; set; }
+}
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/Graphs/DateEntityGraphType.cs b/src/Tests/IntegrationTests/Graphs/DateEntityGraphType.cs
new file mode 100644
index 000000000..9d0df4f14
--- /dev/null
+++ b/src/Tests/IntegrationTests/Graphs/DateEntityGraphType.cs
@@ -0,0 +1,7 @@
+public class DateEntityGraphType :
+    EfObjectGraphType<IntegrationDbContext, DateEntity>
+{
+    public DateEntityGraphType(IEfGraphQLService<IntegrationDbContext> graphQlService) :
+        base(graphQlService) =>
+        AutoMap();
+}
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/Graphs/TimeEntity.cs b/src/Tests/IntegrationTests/Graphs/TimeEntity.cs
new file mode 100644
index 000000000..8121f1506
--- /dev/null
+++ b/src/Tests/IntegrationTests/Graphs/TimeEntity.cs
@@ -0,0 +1,5 @@
+public class TimeEntity
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public Time? Property { get; set; }
+}
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/Graphs/TimeEntityGraphType.cs b/src/Tests/IntegrationTests/Graphs/TimeEntityGraphType.cs
new file mode 100644
index 000000000..c20f2173c
--- /dev/null
+++ b/src/Tests/IntegrationTests/Graphs/TimeEntityGraphType.cs
@@ -0,0 +1,7 @@
+public class TimeEntityGraphType :
+    EfObjectGraphType<IntegrationDbContext, TimeEntity>
+{
+    public TimeEntityGraphType(IEfGraphQLService<IntegrationDbContext> graphQlService) :
+        base(graphQlService) =>
+        AutoMap();
+}
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/IntegrationTests.SchemaPrint.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.SchemaPrint.verified.txt
index 0818a9bca..0eb7e9e3b 100644
--- a/src/Tests/IntegrationTests/IntegrationTests.SchemaPrint.verified.txt
+++ b/src/Tests/IntegrationTests/IntegrationTests.SchemaPrint.verified.txt
@@ -55,6 +55,13 @@ type CustomType {
   property: Long!
 }
 
+type DateEntity {
+  id: ID!
+  property: DateOnly
+}
+
+scalar DateOnly
+
 type Derived implements Interface {
   childrenFromInterface(after: String, first: Int, before: String, last: Int, where: [WhereExpression!], orderBy: [OrderBy!], ids: [ID!]): DerivedChildConnection!
   childrenFromBase(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [DerivedChild!]!
@@ -266,6 +273,8 @@ type Query {
   misNamed(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [WithMisNamedQueryParent!]!
   parentEntities(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [Parent!]!
   childEntities(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [Child!]!
+  dateEntities(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [DateEntity!]!
+  timeEntities(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [TimeEntity!]!
   parentEntitiesConnection(after: String, first: Int, before: String, last: Int, where: [WhereExpression!], orderBy: [OrderBy!], ids: [ID!]): ParentConnection!
   childEntitiesConnection(after: String, first: Int, before: String, last: Int, where: [WhereExpression!], orderBy: [OrderBy!], ids: [ID!]): ChildConnection!
   parentEntitiesFiltered(id: ID, ids: [ID!], where: [WhereExpression!], orderBy: [OrderBy!], skip: Int, take: Int): [FilterParent!]!
@@ -298,6 +307,13 @@ enum StringComparison {
   ORDINAL_IGNORE_CASE
 }
 
+type TimeEntity {
+  id: ID!
+  property: TimeOnly
+}
+
+scalar TimeOnly
+
 input WhereExpression {
   path: String
   comparison: Comparison
diff --git a/src/Tests/IntegrationTests/IntegrationTests.Where_date.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Where_date.verified.txt
new file mode 100644
index 000000000..1d739fbf5
--- /dev/null
+++ b/src/Tests/IntegrationTests/IntegrationTests.Where_date.verified.txt
@@ -0,0 +1,21 @@
+{
+  target:
+{
+  "data": {
+    "dateEntities": [
+      {
+        "id": "Guid_1"
+      }
+    ]
+  }
+},
+  sql: [
+    {
+      HasTransaction: false,
+      Text:
+SELECT [d].[Id], [d].[Property]
+FROM [DateEntities] AS [d]
+WHERE [d].[Property] = '2020-10-01'
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/IntegrationTests.Where_time.verified.txt b/src/Tests/IntegrationTests/IntegrationTests.Where_time.verified.txt
new file mode 100644
index 000000000..b63f25505
--- /dev/null
+++ b/src/Tests/IntegrationTests/IntegrationTests.Where_time.verified.txt
@@ -0,0 +1,21 @@
+{
+  target:
+{
+  "data": {
+    "timeEntities": [
+      {
+        "id": "Guid_1"
+      }
+    ]
+  }
+},
+  sql: [
+    {
+      HasTransaction: false,
+      Text:
+SELECT [t].[Id], [t].[Property]
+FROM [TimeEntities] AS [t]
+WHERE [t].[Property] = '10:11:00'
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/IntegrationTests.cs b/src/Tests/IntegrationTests/IntegrationTests.cs
index 061879081..72bf5f49d 100644
--- a/src/Tests/IntegrationTests/IntegrationTests.cs
+++ b/src/Tests/IntegrationTests/IntegrationTests.cs
@@ -118,6 +118,50 @@ public async Task Where_multiple()
         await RunQuery(database, query, null, null, false, new object[] { entity1, entity2, entity3 });
     }
 
+    [Fact]
+    public async Task Where_date()
+    {
+        var query = """
+            {
+              dateEntities (where: {path: 'Property', comparison: equal, value: '2020-10-1'})
+              {
+                id
+              }
+            }
+            """;
+
+        var entity1 = new DateEntity();
+        var entity2 = new DateEntity
+        {
+            Property = new Date(2020, 10, 1)
+        };
+
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, new object[] { entity1, entity2 });
+    }
+
+    [Fact]
+    public async Task Where_time()
+    {
+        var query = """
+            {
+              timeEntities (where: {path: 'Property', comparison: equal, value: '10:11 AM'})
+              {
+                id
+              }
+            }
+            """;
+
+        var entity1 = new TimeEntity();
+        var entity2 = new TimeEntity
+        {
+            Property = new Time(10, 11)
+        };
+
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, new object[] { entity1, entity2 });
+    }
+
     [Fact]
     public async Task Where_with_nullable_properties1()
     {
diff --git a/src/Tests/IntegrationTests/MyDataContext.cs b/src/Tests/IntegrationTests/MyDataContext.cs
index 2f9121cf4..a9ce6df2f 100644
--- a/src/Tests/IntegrationTests/MyDataContext.cs
+++ b/src/Tests/IntegrationTests/MyDataContext.cs
@@ -2,6 +2,8 @@
     DbContext
 {
     public DbSet<ParentEntity> ParentEntities { get; set; } = null!;
+    public DbSet<DateEntity> DateEntities { get; set; } = null!;
+    public DbSet<TimeEntity> TimeEntities { get; set; } = null!;
     public DbSet<FilterParentEntity> FilterParentEntities { get; set; } = null!;
     public DbSet<FilterChildEntity> FilterChildEntities { get; set; } = null!;
     public DbSet<ChildEntity> ChildEntities { get; set; } = null!;
@@ -70,4 +72,23 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 x => x.HasOne(xs => xs.ManyToManyLeftEntity).WithMany(),
                 x => x.HasOne(xs => xs.ManyToManyRightEntity).WithMany());
     }
+    protected override void ConfigureConventions(ModelConfigurationBuilder builder)
+    {
+        builder.Properties<Date>()
+            .HaveConversion<DateConverter>()
+            .HaveColumnType("date");
+
+        builder.Properties<Date?>()
+            .HaveConversion<NullableDateConverter>()
+            .HaveColumnType("date");
+
+        builder.Properties<Time>()
+            .HaveConversion<TimeConverter>()
+            .HaveColumnType("time");
+
+        builder.Properties<Time?>()
+            .HaveConversion<NullableTimeConverter>()
+            .HaveColumnType("time");
+    }
+
 }
\ No newline at end of file
diff --git a/src/Tests/IntegrationTests/Query.cs b/src/Tests/IntegrationTests/Query.cs
index 0a382d02e..9de537dd7 100644
--- a/src/Tests/IntegrationTests/Query.cs
+++ b/src/Tests/IntegrationTests/Query.cs
@@ -50,6 +50,14 @@ public Query(IEfGraphQLService<IntegrationDbContext> efGraphQlService) :
             name: "childEntities",
             resolve: context => context.DbContext.ChildEntities);
 
+        AddQueryField(
+            name: "dateEntities",
+            resolve: context => context.DbContext.DateEntities);
+
+        AddQueryField(
+            name: "timeEntities",
+            resolve: context => context.DbContext.TimeEntities);
+
         efGraphQlService.AddQueryConnectionField<ParentGraphType, ParentEntity>(
             this,
             name: "parentEntitiesConnection",
diff --git a/src/Tests/IntegrationTests/Schema.cs b/src/Tests/IntegrationTests/Schema.cs
index f53fea505..053853d68 100644
--- a/src/Tests/IntegrationTests/Schema.cs
+++ b/src/Tests/IntegrationTests/Schema.cs
@@ -12,6 +12,9 @@ public Schema(IServiceProvider resolver) :
         RegisterTypeMapping(typeof(Child2Entity), typeof(Child2GraphType));
         RegisterTypeMapping(typeof(ChildEntity), typeof(ChildGraphType));
         RegisterTypeMapping(typeof(ParentEntity), typeof(ParentGraphType));
+        RegisterTypeMapping(typeof(DateEntity), typeof(DateEntityGraphType));
+        RegisterTypeMapping(typeof(TimeEntity), typeof(TimeEntityGraphType));
+        RegisterTypeMapping(typeof(TimeEntity), typeof(TimeEntityGraphType));
         RegisterTypeMapping(typeof(Level1Entity), typeof(Level1GraphType));
         RegisterTypeMapping(typeof(Level2Entity), typeof(Level2GraphType));
         RegisterTypeMapping(typeof(Level3Entity), typeof(Level3GraphType));
diff --git a/src/Tests/TypeConverterTests.cs b/src/Tests/TypeConverterTests.cs
index 20510020e..b9e5980e7 100644
--- a/src/Tests/TypeConverterTests.cs
+++ b/src/Tests/TypeConverterTests.cs
@@ -27,6 +27,22 @@ public void ConvertStringToDatetime()
         Assert.Equal(dateTime, result);
     }
 
+    [Fact]
+    public void ConvertStringToDate()
+    {
+        var date = new Date(2020,10,1);
+        var result = TypeConverter.ConvertStringToType(date.ToString("yyyy-MM-dd"), typeof(Date));
+        Assert.Equal(date, result);
+    }
+
+    [Fact]
+    public void ConvertStringToTime()
+    {
+        var time = new Time(10,1);
+        var result = TypeConverter.ConvertStringToType(time.ToString(), typeof(Time));
+        Assert.Equal(time, result);
+    }
+
     [Fact]
     public void ConvertStringToEnum()
     {