diff --git a/src/Linq2GraphQL.Generator/GraphQLSchema/Helpers.cs b/src/Linq2GraphQL.Generator/GraphQLSchema/Helpers.cs
index dbeedfc1..ce538b64 100644
--- a/src/Linq2GraphQL.Generator/GraphQLSchema/Helpers.cs
+++ b/src/Linq2GraphQL.Generator/GraphQLSchema/Helpers.cs
@@ -120,10 +120,7 @@ internal static string SafeVariableName(string name)
             { "Decimal", new ValueTuple<string, Type>("decimal", typeof(decimal)) },
             { "TimeSpan", new ValueTuple<string, Type>("TimeSpan", typeof(TimeSpan)) },
             { "Byte", new ValueTuple<string, Type>("byte", typeof(byte)) },
-            
-            { "LocalDate", new ValueTuple<string, Type>("DateTime", typeof(DateTime)) },
-            { "LocalTime", new ValueTuple<string, Type>("TimeSpan", typeof(TimeSpan)) },
+            { "LocalDate", new ValueTuple<string, Type>("DateOnly", typeof(DateOnly)) },
+            { "LocalTime", new ValueTuple<string, Type>("TimeOnly", typeof(TimeOnly)) },
         };
-
-
 }
\ No newline at end of file
diff --git a/src/Linq2GraphQL.Generator/Properties/launchSettings.json b/src/Linq2GraphQL.Generator/Properties/launchSettings.json
index f1dfb782..04f0229a 100644
--- a/src/Linq2GraphQL.Generator/Properties/launchSettings.json
+++ b/src/Linq2GraphQL.Generator/Properties/launchSettings.json
@@ -2,7 +2,8 @@
   "profiles": {
     "Linq2GraphQL.Generator": {
       "commandName": "Project",
-      "commandLineArgs": "https://localhost:7184/graphql/ -c=\"SampleClient\" -n=\"Linq2GraphQL.TestClient\" -o=\"C:\\Code\\Github\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClient\\Generated\" -s=true -d=true"
+     //"commandLineArgs": "https://localhost:7184/graphql/ -c=\"SampleClient\" -n=\"Linq2GraphQL.TestClient\" -o=\"C:\\Code\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClient\\Generated\" -s=true -d=true"
+      "commandLineArgs": "https://localhost:50741/graphql/ -c=\"SampleNullableClient\" -n=\"Linq2GraphQL.TestClientNullable\" -o=\"C:\\Code\\Linq2GraphQL.Client\\test\\Linq2GraphQL.TestClientNullable\\Generated\" -s=true -d=true -nu"
     }
   }
 }
\ No newline at end of file
diff --git a/test/Linq2GraphQL.TestClient/Generated/Inputs/AddressInput.cs b/test/Linq2GraphQL.TestClient/Generated/Inputs/AddressInput.cs
index 877db8cb..9bf1c329 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Inputs/AddressInput.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Inputs/AddressInput.cs
@@ -41,9 +41,9 @@ public string PostalCode
 
 	[GraphQLMember("createdDate")]
 	[JsonPropertyName("createdDate")]
-	public DateTime CreatedDate 
+	public DateOnly CreatedDate 
 	{
-		get => GetValue<DateTime>("createdDate");
+		get => GetValue<DateOnly>("createdDate");
     	set => SetValue("createdDate", value);
 	}
 
diff --git a/test/Linq2GraphQL.TestClient/Generated/Inputs/InputFactory.cs b/test/Linq2GraphQL.TestClient/Generated/Inputs/InputFactory.cs
index 82a07137..86e80061 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Inputs/InputFactory.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Inputs/InputFactory.cs
@@ -212,7 +212,7 @@ public static AddressInput PostalCode(this AddressInput input, string val)
     }
 
 
-    public static AddressInput CreatedDate(this AddressInput input, DateTime val)
+    public static AddressInput CreatedDate(this AddressInput input, DateOnly val)
     {
          input.CreatedDate = val;
          return input;
@@ -1140,84 +1140,84 @@ public static ListFilterInputTypeOfOrderLineFilterInput Any(this ListFilterInput
 public static class LocalDateOperationFilterInputExtensions
 { 
 	
-    public static LocalDateOperationFilterInput Eq(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Eq(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Eq = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Neq(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Neq(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Neq = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput In(this LocalDateOperationFilterInput input, List<DateTime?> val)
+    public static LocalDateOperationFilterInput In(this LocalDateOperationFilterInput input, List<DateOnly?> val)
     {
          input.In = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Nin(this LocalDateOperationFilterInput input, List<DateTime?> val)
+    public static LocalDateOperationFilterInput Nin(this LocalDateOperationFilterInput input, List<DateOnly?> val)
     {
          input.Nin = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Gt(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Gt(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Gt = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Ngt(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Ngt(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Ngt = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Gte(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Gte(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Gte = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Ngte(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Ngte(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Ngte = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Lt(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Lt(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Lt = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Nlt(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Nlt(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Nlt = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Lte(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Lte(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Lte = val;
          return input;
     }
 
 
-    public static LocalDateOperationFilterInput Nlte(this LocalDateOperationFilterInput input, DateTime? val)
+    public static LocalDateOperationFilterInput Nlte(this LocalDateOperationFilterInput input, DateOnly? val)
     {
          input.Nlte = val;
          return input;
@@ -1228,84 +1228,84 @@ public static LocalDateOperationFilterInput Nlte(this LocalDateOperationFilterIn
 public static class LocalTimeOperationFilterInputExtensions
 { 
 	
-    public static LocalTimeOperationFilterInput Eq(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Eq(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Eq = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Neq(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Neq(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Neq = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput In(this LocalTimeOperationFilterInput input, List<TimeSpan?> val)
+    public static LocalTimeOperationFilterInput In(this LocalTimeOperationFilterInput input, List<TimeOnly?> val)
     {
          input.In = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Nin(this LocalTimeOperationFilterInput input, List<TimeSpan?> val)
+    public static LocalTimeOperationFilterInput Nin(this LocalTimeOperationFilterInput input, List<TimeOnly?> val)
     {
          input.Nin = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Gt(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Gt(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Gt = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Ngt(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Ngt(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Ngt = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Gte(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Gte(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Gte = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Ngte(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Ngte(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Ngte = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Lt(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Lt(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Lt = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Nlt(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Nlt(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Nlt = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Lte(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Lte(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Lte = val;
          return input;
     }
 
 
-    public static LocalTimeOperationFilterInput Nlte(this LocalTimeOperationFilterInput input, TimeSpan? val)
+    public static LocalTimeOperationFilterInput Nlte(this LocalTimeOperationFilterInput input, TimeOnly? val)
     {
          input.Nlte = val;
          return input;
@@ -1369,6 +1369,24 @@ public static OrderFilterInput OrderDate(this OrderFilterInput input, Action<Dat
         return input;
     }
 
+    public static OrderFilterInput OrderDateTime(this OrderFilterInput input, Action<DateTimeOperationFilterInput> mod)
+    {
+        var filter = new DateTimeOperationFilterInput();
+        mod ??= _ => { };
+        mod(filter); 
+        input.OrderDateTime = filter;
+        return input;
+    }
+
+    public static OrderFilterInput OrderDay(this OrderFilterInput input, Action<LocalDateOperationFilterInput> mod)
+    {
+        var filter = new LocalDateOperationFilterInput();
+        mod ??= _ => { };
+        mod(filter); 
+        input.OrderDay = filter;
+        return input;
+    }
+
     public static OrderFilterInput Lines(this OrderFilterInput input, Action<ListFilterInputTypeOfOrderLineFilterInput> mod)
     {
         var filter = new ListFilterInputTypeOfOrderLineFilterInput();
@@ -1432,6 +1450,20 @@ public static OrderInput OrderDate(this OrderInput input, DateTimeOffset val)
          return input;
     }
 
+
+    public static OrderInput OrderDateTime(this OrderInput input, DateTimeOffset val)
+    {
+         input.OrderDateTime = val;
+         return input;
+    }
+
+
+    public static OrderInput OrderDay(this OrderInput input, DateOnly val)
+    {
+         input.OrderDay = val;
+         return input;
+    }
+
     public static OrderInput Lines(this OrderInput input, Action<List<OrderLineInput>> mod)
     {
         var filter = new List<OrderLineInput>();
@@ -1442,7 +1474,7 @@ public static OrderInput Lines(this OrderInput input, Action<List<OrderLineInput
     }
 
 
-    public static OrderInput EntryTime(this OrderInput input, TimeSpan? val)
+    public static OrderInput EntryTime(this OrderInput input, TimeOnly? val)
     {
          input.EntryTime = val;
          return input;
@@ -1602,6 +1634,20 @@ public static OrderSortInput OrderDate(this OrderSortInput input, SortEnumType?
     }
 
 
+    public static OrderSortInput OrderDateTime(this OrderSortInput input, SortEnumType? val)
+    {
+         input.OrderDateTime = val;
+         return input;
+    }
+
+
+    public static OrderSortInput OrderDay(this OrderSortInput input, SortEnumType? val)
+    {
+         input.OrderDay = val;
+         return input;
+    }
+
+
     public static OrderSortInput EntryTime(this OrderSortInput input, SortEnumType? val)
     {
          input.EntryTime = val;
diff --git a/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalDateOperationFilterInput.cs b/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalDateOperationFilterInput.cs
index 5600d712..ab3ba949 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalDateOperationFilterInput.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalDateOperationFilterInput.cs
@@ -17,97 +17,97 @@ public partial class LocalDateOperationFilterInput : GraphInputBase
 {
 	[GraphQLMember("eq")]
 	[JsonPropertyName("eq")]
-	public DateTime? Eq 
+	public DateOnly? Eq 
 	{
-		get => GetValue<DateTime?>("eq");
+		get => GetValue<DateOnly?>("eq");
     	set => SetValue("eq", value);
 	}
 
 	[GraphQLMember("neq")]
 	[JsonPropertyName("neq")]
-	public DateTime? Neq 
+	public DateOnly? Neq 
 	{
-		get => GetValue<DateTime?>("neq");
+		get => GetValue<DateOnly?>("neq");
     	set => SetValue("neq", value);
 	}
 
 	[GraphQLMember("in")]
 	[JsonPropertyName("in")]
-	public List<DateTime?> In 
+	public List<DateOnly?> In 
 	{
-		get => GetValue<List<DateTime?>>("in");
+		get => GetValue<List<DateOnly?>>("in");
     	set => SetValue("in", value);
 	}
 
 	[GraphQLMember("nin")]
 	[JsonPropertyName("nin")]
-	public List<DateTime?> Nin 
+	public List<DateOnly?> Nin 
 	{
-		get => GetValue<List<DateTime?>>("nin");
+		get => GetValue<List<DateOnly?>>("nin");
     	set => SetValue("nin", value);
 	}
 
 	[GraphQLMember("gt")]
 	[JsonPropertyName("gt")]
-	public DateTime? Gt 
+	public DateOnly? Gt 
 	{
-		get => GetValue<DateTime?>("gt");
+		get => GetValue<DateOnly?>("gt");
     	set => SetValue("gt", value);
 	}
 
 	[GraphQLMember("ngt")]
 	[JsonPropertyName("ngt")]
-	public DateTime? Ngt 
+	public DateOnly? Ngt 
 	{
-		get => GetValue<DateTime?>("ngt");
+		get => GetValue<DateOnly?>("ngt");
     	set => SetValue("ngt", value);
 	}
 
 	[GraphQLMember("gte")]
 	[JsonPropertyName("gte")]
-	public DateTime? Gte 
+	public DateOnly? Gte 
 	{
-		get => GetValue<DateTime?>("gte");
+		get => GetValue<DateOnly?>("gte");
     	set => SetValue("gte", value);
 	}
 
 	[GraphQLMember("ngte")]
 	[JsonPropertyName("ngte")]
-	public DateTime? Ngte 
+	public DateOnly? Ngte 
 	{
-		get => GetValue<DateTime?>("ngte");
+		get => GetValue<DateOnly?>("ngte");
     	set => SetValue("ngte", value);
 	}
 
 	[GraphQLMember("lt")]
 	[JsonPropertyName("lt")]
-	public DateTime? Lt 
+	public DateOnly? Lt 
 	{
-		get => GetValue<DateTime?>("lt");
+		get => GetValue<DateOnly?>("lt");
     	set => SetValue("lt", value);
 	}
 
 	[GraphQLMember("nlt")]
 	[JsonPropertyName("nlt")]
-	public DateTime? Nlt 
+	public DateOnly? Nlt 
 	{
-		get => GetValue<DateTime?>("nlt");
+		get => GetValue<DateOnly?>("nlt");
     	set => SetValue("nlt", value);
 	}
 
 	[GraphQLMember("lte")]
 	[JsonPropertyName("lte")]
-	public DateTime? Lte 
+	public DateOnly? Lte 
 	{
-		get => GetValue<DateTime?>("lte");
+		get => GetValue<DateOnly?>("lte");
     	set => SetValue("lte", value);
 	}
 
 	[GraphQLMember("nlte")]
 	[JsonPropertyName("nlte")]
-	public DateTime? Nlte 
+	public DateOnly? Nlte 
 	{
-		get => GetValue<DateTime?>("nlte");
+		get => GetValue<DateOnly?>("nlte");
     	set => SetValue("nlte", value);
 	}
 
diff --git a/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalTimeOperationFilterInput.cs b/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalTimeOperationFilterInput.cs
index 209b6b52..eb772833 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalTimeOperationFilterInput.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Inputs/LocalTimeOperationFilterInput.cs
@@ -17,97 +17,97 @@ public partial class LocalTimeOperationFilterInput : GraphInputBase
 {
 	[GraphQLMember("eq")]
 	[JsonPropertyName("eq")]
-	public TimeSpan? Eq 
+	public TimeOnly? Eq 
 	{
-		get => GetValue<TimeSpan?>("eq");
+		get => GetValue<TimeOnly?>("eq");
     	set => SetValue("eq", value);
 	}
 
 	[GraphQLMember("neq")]
 	[JsonPropertyName("neq")]
-	public TimeSpan? Neq 
+	public TimeOnly? Neq 
 	{
-		get => GetValue<TimeSpan?>("neq");
+		get => GetValue<TimeOnly?>("neq");
     	set => SetValue("neq", value);
 	}
 
 	[GraphQLMember("in")]
 	[JsonPropertyName("in")]
-	public List<TimeSpan?> In 
+	public List<TimeOnly?> In 
 	{
-		get => GetValue<List<TimeSpan?>>("in");
+		get => GetValue<List<TimeOnly?>>("in");
     	set => SetValue("in", value);
 	}
 
 	[GraphQLMember("nin")]
 	[JsonPropertyName("nin")]
-	public List<TimeSpan?> Nin 
+	public List<TimeOnly?> Nin 
 	{
-		get => GetValue<List<TimeSpan?>>("nin");
+		get => GetValue<List<TimeOnly?>>("nin");
     	set => SetValue("nin", value);
 	}
 
 	[GraphQLMember("gt")]
 	[JsonPropertyName("gt")]
-	public TimeSpan? Gt 
+	public TimeOnly? Gt 
 	{
-		get => GetValue<TimeSpan?>("gt");
+		get => GetValue<TimeOnly?>("gt");
     	set => SetValue("gt", value);
 	}
 
 	[GraphQLMember("ngt")]
 	[JsonPropertyName("ngt")]
-	public TimeSpan? Ngt 
+	public TimeOnly? Ngt 
 	{
-		get => GetValue<TimeSpan?>("ngt");
+		get => GetValue<TimeOnly?>("ngt");
     	set => SetValue("ngt", value);
 	}
 
 	[GraphQLMember("gte")]
 	[JsonPropertyName("gte")]
-	public TimeSpan? Gte 
+	public TimeOnly? Gte 
 	{
-		get => GetValue<TimeSpan?>("gte");
+		get => GetValue<TimeOnly?>("gte");
     	set => SetValue("gte", value);
 	}
 
 	[GraphQLMember("ngte")]
 	[JsonPropertyName("ngte")]
-	public TimeSpan? Ngte 
+	public TimeOnly? Ngte 
 	{
-		get => GetValue<TimeSpan?>("ngte");
+		get => GetValue<TimeOnly?>("ngte");
     	set => SetValue("ngte", value);
 	}
 
 	[GraphQLMember("lt")]
 	[JsonPropertyName("lt")]
-	public TimeSpan? Lt 
+	public TimeOnly? Lt 
 	{
-		get => GetValue<TimeSpan?>("lt");
+		get => GetValue<TimeOnly?>("lt");
     	set => SetValue("lt", value);
 	}
 
 	[GraphQLMember("nlt")]
 	[JsonPropertyName("nlt")]
-	public TimeSpan? Nlt 
+	public TimeOnly? Nlt 
 	{
-		get => GetValue<TimeSpan?>("nlt");
+		get => GetValue<TimeOnly?>("nlt");
     	set => SetValue("nlt", value);
 	}
 
 	[GraphQLMember("lte")]
 	[JsonPropertyName("lte")]
-	public TimeSpan? Lte 
+	public TimeOnly? Lte 
 	{
-		get => GetValue<TimeSpan?>("lte");
+		get => GetValue<TimeOnly?>("lte");
     	set => SetValue("lte", value);
 	}
 
 	[GraphQLMember("nlte")]
 	[JsonPropertyName("nlte")]
-	public TimeSpan? Nlte 
+	public TimeOnly? Nlte 
 	{
-		get => GetValue<TimeSpan?>("nlte");
+		get => GetValue<TimeOnly?>("nlte");
     	set => SetValue("nlte", value);
 	}
 
diff --git a/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderFilterInput.cs b/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderFilterInput.cs
index aebec590..38c5b956 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderFilterInput.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderFilterInput.cs
@@ -63,6 +63,22 @@ public DateTimeOperationFilterInput OrderDate
     	set => SetValue("orderDate", value);
 	}
 
+	[GraphQLMember("orderDateTime")]
+	[JsonPropertyName("orderDateTime")]
+	public DateTimeOperationFilterInput OrderDateTime 
+	{
+		get => GetValue<DateTimeOperationFilterInput>("orderDateTime");
+    	set => SetValue("orderDateTime", value);
+	}
+
+	[GraphQLMember("orderDay")]
+	[JsonPropertyName("orderDay")]
+	public LocalDateOperationFilterInput OrderDay 
+	{
+		get => GetValue<LocalDateOperationFilterInput>("orderDay");
+    	set => SetValue("orderDay", value);
+	}
+
 	[GraphQLMember("lines")]
 	[JsonPropertyName("lines")]
 	public ListFilterInputTypeOfOrderLineFilterInput Lines 
diff --git a/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderInput.cs b/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderInput.cs
index 273abd65..6f4cfc5e 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderInput.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderInput.cs
@@ -47,6 +47,22 @@ public DateTimeOffset OrderDate
     	set => SetValue("orderDate", value);
 	}
 
+	[GraphQLMember("orderDateTime")]
+	[JsonPropertyName("orderDateTime")]
+	public DateTimeOffset OrderDateTime 
+	{
+		get => GetValue<DateTimeOffset>("orderDateTime");
+    	set => SetValue("orderDateTime", value);
+	}
+
+	[GraphQLMember("orderDay")]
+	[JsonPropertyName("orderDay")]
+	public DateOnly OrderDay 
+	{
+		get => GetValue<DateOnly>("orderDay");
+    	set => SetValue("orderDay", value);
+	}
+
 	[GraphQLMember("lines")]
 	[JsonPropertyName("lines")]
 	public List<OrderLineInput> Lines 
@@ -57,9 +73,9 @@ public List<OrderLineInput> Lines
 
 	[GraphQLMember("entryTime")]
 	[JsonPropertyName("entryTime")]
-	public TimeSpan? EntryTime 
+	public TimeOnly? EntryTime 
 	{
-		get => GetValue<TimeSpan?>("entryTime");
+		get => GetValue<TimeOnly?>("entryTime");
     	set => SetValue("entryTime", value);
 	}
 
diff --git a/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderSortInput.cs b/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderSortInput.cs
index 4ec4ede3..3456c130 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderSortInput.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Inputs/OrderSortInput.cs
@@ -47,6 +47,22 @@ public SortEnumType? OrderDate
     	set => SetValue("orderDate", value);
 	}
 
+	[GraphQLMember("orderDateTime")]
+	[JsonPropertyName("orderDateTime")]
+	public SortEnumType? OrderDateTime 
+	{
+		get => GetValue<SortEnumType?>("orderDateTime");
+    	set => SetValue("orderDateTime", value);
+	}
+
+	[GraphQLMember("orderDay")]
+	[JsonPropertyName("orderDay")]
+	public SortEnumType? OrderDay 
+	{
+		get => GetValue<SortEnumType?>("orderDay");
+    	set => SetValue("orderDay", value);
+	}
+
 	[GraphQLMember("entryTime")]
 	[JsonPropertyName("entryTime")]
 	public SortEnumType? EntryTime 
diff --git a/test/Linq2GraphQL.TestClient/Generated/Types/Address.cs b/test/Linq2GraphQL.TestClient/Generated/Types/Address.cs
index 91e8792a..31df8309 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Types/Address.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Types/Address.cs
@@ -30,6 +30,6 @@ public partial class Address : GraphQLTypeBase
 
     [GraphQLMember("createdDate")]
     [JsonPropertyName("createdDate")]
-    public DateTime CreatedDate { get; set; }
+    public DateOnly CreatedDate { get; set; }
 
 }
diff --git a/test/Linq2GraphQL.TestClient/Generated/Types/Order.cs b/test/Linq2GraphQL.TestClient/Generated/Types/Order.cs
index 7281f376..c986cad3 100644
--- a/test/Linq2GraphQL.TestClient/Generated/Types/Order.cs
+++ b/test/Linq2GraphQL.TestClient/Generated/Types/Order.cs
@@ -74,13 +74,21 @@ public partial class Order : GraphQLTypeBase
     [JsonPropertyName("orderDate")]
     public DateTimeOffset OrderDate { get; set; }
 
+    [GraphQLMember("orderDateTime")]
+    [JsonPropertyName("orderDateTime")]
+    public DateTimeOffset OrderDateTime { get; set; }
+
+    [GraphQLMember("orderDay")]
+    [JsonPropertyName("orderDay")]
+    public DateOnly OrderDay { get; set; }
+
     [GraphQLMember("lines")]
     [JsonPropertyName("lines")]
     public List<OrderLine> Lines { get; set; }
 
     [GraphQLMember("entryTime")]
     [JsonPropertyName("entryTime")]
-    public TimeSpan? EntryTime { get; set; }
+    public TimeOnly? EntryTime { get; set; }
 
     [Obsolete("This propery is obsolete and should not be used!")]
     [GraphQLMember("grade")]
diff --git a/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/AddressInput.cs b/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/AddressInput.cs
index e0d3b06c..21b23f07 100644
--- a/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/AddressInput.cs
+++ b/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/AddressInput.cs
@@ -41,9 +41,9 @@ public required string PostalCode
 
 	[GraphQLMember("createdDate")]
 	[JsonPropertyName("createdDate")]
-	public required DateTime CreatedDate 
+	public required DateOnly CreatedDate 
 	{
-		get => GetValue<DateTime>("createdDate");
+		get => GetValue<DateOnly>("createdDate");
     	set => SetValue("createdDate", value);
 	}
 
diff --git a/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/OrderInput.cs b/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/OrderInput.cs
index 7138e3cf..19246043 100644
--- a/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/OrderInput.cs
+++ b/test/Linq2GraphQL.TestClientNullable/Generated/Inputs/OrderInput.cs
@@ -47,6 +47,22 @@ public required DateTimeOffset OrderDate
     	set => SetValue("orderDate", value);
 	}
 
+	[GraphQLMember("orderDateTime")]
+	[JsonPropertyName("orderDateTime")]
+	public required DateTimeOffset OrderDateTime 
+	{
+		get => GetValue<DateTimeOffset>("orderDateTime");
+    	set => SetValue("orderDateTime", value);
+	}
+
+	[GraphQLMember("orderDay")]
+	[JsonPropertyName("orderDay")]
+	public required DateOnly OrderDay 
+	{
+		get => GetValue<DateOnly>("orderDay");
+    	set => SetValue("orderDay", value);
+	}
+
 	[GraphQLMember("lines")]
 	[JsonPropertyName("lines")]
 	public required List<OrderLineInput> Lines 
@@ -57,9 +73,9 @@ public required List<OrderLineInput> Lines
 
 	[GraphQLMember("entryTime")]
 	[JsonPropertyName("entryTime")]
-	public TimeSpan? EntryTime 
+	public TimeOnly? EntryTime 
 	{
-		get => GetValue<TimeSpan?>("entryTime");
+		get => GetValue<TimeOnly?>("entryTime");
     	set => SetValue("entryTime", value);
 	}
 
diff --git a/test/Linq2GraphQL.TestClientNullable/Generated/Types/Address.cs b/test/Linq2GraphQL.TestClientNullable/Generated/Types/Address.cs
index e2b8d286..07ba9d92 100644
--- a/test/Linq2GraphQL.TestClientNullable/Generated/Types/Address.cs
+++ b/test/Linq2GraphQL.TestClientNullable/Generated/Types/Address.cs
@@ -31,6 +31,6 @@ public partial class Address : GraphQLTypeBase
 
     [GraphQLMember("createdDate")]
     [JsonPropertyName("createdDate")]
-    public DateTime CreatedDate { get; set; }
+    public DateOnly CreatedDate { get; set; }
 
 }
diff --git a/test/Linq2GraphQL.TestClientNullable/Generated/Types/Order.cs b/test/Linq2GraphQL.TestClientNullable/Generated/Types/Order.cs
index 326b2611..ae03c884 100644
--- a/test/Linq2GraphQL.TestClientNullable/Generated/Types/Order.cs
+++ b/test/Linq2GraphQL.TestClientNullable/Generated/Types/Order.cs
@@ -75,13 +75,21 @@ public partial class Order : GraphQLTypeBase
     [JsonPropertyName("orderDate")]
     public DateTimeOffset OrderDate { get; set; }
 
+    [GraphQLMember("orderDateTime")]
+    [JsonPropertyName("orderDateTime")]
+    public DateTimeOffset OrderDateTime { get; set; }
+
+    [GraphQLMember("orderDay")]
+    [JsonPropertyName("orderDay")]
+    public DateOnly OrderDay { get; set; }
+
     [GraphQLMember("lines")]
     [JsonPropertyName("lines")]
     public List<OrderLine> Lines { get; set; }
 
     [GraphQLMember("entryTime")]
     [JsonPropertyName("entryTime")]
-    public TimeSpan? EntryTime { get; set; }
+    public TimeOnly? EntryTime { get; set; }
 
     [Obsolete("This propery is obsolete and should not be used!")]
     [GraphQLMember("grade")]
diff --git a/test/Linq2GraphQL.TestServer.Shared/Models/Order.cs b/test/Linq2GraphQL.TestServer.Shared/Models/Order.cs
index 11bd860f..477d4aab 100644
--- a/test/Linq2GraphQL.TestServer.Shared/Models/Order.cs
+++ b/test/Linq2GraphQL.TestServer.Shared/Models/Order.cs
@@ -12,6 +12,8 @@ public Order(Customer customer)
 
     public Address? Address { get; set; }
     public DateTimeOffset OrderDate { get; set; }
+    public DateTime OrderDateTime { get; set; }
+    public DateOnly OrderDay { get; set; }
     public List<OrderLine> Lines { get; set; } = new();
     public TimeOnly? EntryTime { get; set; }