diff --git a/src/Optional.FluentValidation/ValidatorExtensions.Email.cs b/src/Optional.FluentValidation/ValidatorExtensions.Email.cs
index fb9d097..6617b30 100644
--- a/src/Optional.FluentValidation/ValidatorExtensions.Email.cs
+++ b/src/Optional.FluentValidation/ValidatorExtensions.Email.cs
@@ -1,6 +1,6 @@
 using System;
-using FluentValidation;
 using DeskDirector.Text.Json.Validation.Validators;
+using FluentValidation;
 
 namespace DeskDirector.Text.Json.Validation
 {
@@ -9,8 +9,8 @@ public static partial class ValidatorExtensions
         /// <summary>
         /// Email validator without using Regex
         /// </summary>
-        public static IRuleBuilderOptions<T, IOptional<string>> Email<T>(
-            this IRuleBuilder<T, IOptional<string>> ruleBuilder)
+        public static IRuleBuilderOptions<T, Optional<string>> Email<T>(
+            this IRuleBuilder<T, Optional<string>> ruleBuilder)
         {
             ArgumentNullException.ThrowIfNull(ruleBuilder);
 
diff --git a/src/Optional.FluentValidation/Validators/EmailValidator.cs b/src/Optional.FluentValidation/Validators/EmailValidator.cs
index dd754af..1428f9f 100644
--- a/src/Optional.FluentValidation/Validators/EmailValidator.cs
+++ b/src/Optional.FluentValidation/Validators/EmailValidator.cs
@@ -4,11 +4,11 @@
 
 namespace DeskDirector.Text.Json.Validation.Validators
 {
-    public class EmailValidator<TModel> : PropertyValidator<TModel, IOptional<string>>
+    public class EmailValidator<TModel> : PropertyValidator<TModel, Optional<string>>
     {
         public override string Name => "OptionalEmailValidator";
 
-        public override bool IsValid(ValidationContext<TModel> context, IOptional<string>? optional)
+        public override bool IsValid(ValidationContext<TModel> context, Optional<string> optional)
         {
             if (optional == null) {
                 return true;