diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkApplicationConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkApplicationConfiguration.cs
index e4978601..d186f3d0 100644
--- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkApplicationConfiguration.cs
+++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkApplicationConfiguration.cs
@@ -33,7 +33,7 @@ namespace OpenIddict.EntityFramework
             // Entity Framework would throw an exception due to the TKey generic parameter
             // being non-nullable when using value types like short, int, long or Guid.
 
-            HasKey(application => application.Id!);
+            HasKey(application => application.Id);
 
             Property(application => application.ClientId)
                 .HasMaxLength(100)
@@ -46,8 +46,11 @@ namespace OpenIddict.EntityFramework
                 .HasMaxLength(50)
                 .IsConcurrencyToken();
 
+            Property(application => application.ConsentType)
+                .HasMaxLength(50);
+
             Property(application => application.Type)
-                .HasMaxLength(25);
+                .HasMaxLength(50);
 
             HasMany(application => application.Authorizations)
                 .WithOptional(authorization => authorization.Application!)
diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkAuthorizationConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkAuthorizationConfiguration.cs
index 94bcd7c9..4f534dcf 100644
--- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkAuthorizationConfiguration.cs
+++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkAuthorizationConfiguration.cs
@@ -31,20 +31,20 @@ namespace OpenIddict.EntityFramework
             // Entity Framework would throw an exception due to the TKey generic parameter
             // being non-nullable when using value types like short, int, long or Guid.
 
-            HasKey(authorization => authorization.Id!);
+            HasKey(authorization => authorization.Id);
 
             Property(authorization => authorization.ConcurrencyToken)
                 .HasMaxLength(50)
                 .IsConcurrencyToken();
 
             Property(authorization => authorization.Status)
-                .HasMaxLength(25);
+                .HasMaxLength(50);
 
             Property(authorization => authorization.Subject)
-                .HasMaxLength(450);
+                .HasMaxLength(400);
 
             Property(authorization => authorization.Type)
-                .HasMaxLength(25);
+                .HasMaxLength(50);
 
             HasMany(authorization => authorization.Tokens)
                 .WithOptional(token => token.Authorization!)
diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkScopeConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkScopeConfiguration.cs
index eb8a7c4b..625fbb97 100644
--- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkScopeConfiguration.cs
+++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkScopeConfiguration.cs
@@ -29,7 +29,7 @@ namespace OpenIddict.EntityFramework
             // Entity Framework would throw an exception due to the TKey generic parameter
             // being non-nullable when using value types like short, int, long or Guid.
 
-            HasKey(scope => scope.Id!);
+            HasKey(scope => scope.Id);
 
             Property(scope => scope.ConcurrencyToken)
                 .HasMaxLength(50)
diff --git a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkTokenConfiguration.cs b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkTokenConfiguration.cs
index 085f8350..5bc66e91 100644
--- a/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkTokenConfiguration.cs
+++ b/src/OpenIddict.EntityFramework/Configurations/OpenIddictEntityFrameworkTokenConfiguration.cs
@@ -33,7 +33,7 @@ namespace OpenIddict.EntityFramework
             // Entity Framework would throw an exception due to the TKey generic parameter
             // being non-nullable when using value types like short, int, long or Guid.
 
-            HasKey(token => token.Id!);
+            HasKey(token => token.Id);
 
             Property(token => token.ConcurrencyToken)
                 .HasMaxLength(50)
@@ -47,13 +47,13 @@ namespace OpenIddict.EntityFramework
                 .HasColumnAnnotation(IndexAnnotation.AnnotationName, new IndexAnnotation(new IndexAttribute()));
 
             Property(token => token.Status)
-                .HasMaxLength(25);
+                .HasMaxLength(50);
 
             Property(token => token.Subject)
-                .HasMaxLength(450);
+                .HasMaxLength(400);
 
             Property(token => token.Type)
-                .HasMaxLength(25);
+                .HasMaxLength(50);
 
             ToTable("OpenIddictTokens");
         }
diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreApplicationConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreApplicationConfiguration.cs
index aef7b342..bc72d710 100644
--- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreApplicationConfiguration.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreApplicationConfiguration.cs
@@ -52,11 +52,14 @@ namespace OpenIddict.EntityFrameworkCore
                    .HasMaxLength(50)
                    .IsConcurrencyToken();
 
-            builder.Property(application => application.Id!)
+            builder.Property(application => application.ConsentType)
+                   .HasMaxLength(50);
+
+            builder.Property(application => application.Id)
                    .ValueGeneratedOnAdd();
 
             builder.Property(application => application.Type)
-                   .HasMaxLength(25);
+                   .HasMaxLength(50);
 
             builder.HasMany(application => application.Authorizations)
                    .WithOne(authorization => authorization.Application!)
diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs
index eba33bd8..be740139 100644
--- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreAuthorizationConfiguration.cs
@@ -49,17 +49,17 @@ namespace OpenIddict.EntityFrameworkCore
                    .HasMaxLength(50)
                    .IsConcurrencyToken();
 
-            builder.Property(authorization => authorization.Id!)
+            builder.Property(authorization => authorization.Id)
                    .ValueGeneratedOnAdd();
 
             builder.Property(authorization => authorization.Status)
-                   .HasMaxLength(25);
+                   .HasMaxLength(50);
 
             builder.Property(authorization => authorization.Subject)
-                   .HasMaxLength(450);
+                   .HasMaxLength(400);
 
             builder.Property(authorization => authorization.Type)
-                   .HasMaxLength(25);
+                   .HasMaxLength(50);
 
             builder.HasMany(authorization => authorization.Tokens)
                    .WithOne(token => token.Authorization!)
diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreScopeConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreScopeConfiguration.cs
index 0634fce5..ce30b288 100644
--- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreScopeConfiguration.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreScopeConfiguration.cs
@@ -45,7 +45,7 @@ namespace OpenIddict.EntityFrameworkCore
                    .HasMaxLength(50)
                    .IsConcurrencyToken();
 
-            builder.Property(scope => scope.Id!)
+            builder.Property(scope => scope.Id)
                    .ValueGeneratedOnAdd();
 
             builder.Property(scope => scope.Name)
diff --git a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreTokenConfiguration.cs b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreTokenConfiguration.cs
index 8a3ea041..f98b83d3 100644
--- a/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreTokenConfiguration.cs
+++ b/src/OpenIddict.EntityFrameworkCore/Configurations/OpenIddictEntityFrameworkCoreTokenConfiguration.cs
@@ -55,20 +55,20 @@ namespace OpenIddict.EntityFrameworkCore
                    .HasMaxLength(50)
                    .IsConcurrencyToken();
 
-            builder.Property(token => token.Id!)
+            builder.Property(token => token.Id)
                    .ValueGeneratedOnAdd();
 
             builder.Property(token => token.ReferenceId)
                    .HasMaxLength(100);
 
             builder.Property(token => token.Status)
-                   .HasMaxLength(25);
+                   .HasMaxLength(50);
 
             builder.Property(token => token.Subject)
-                   .HasMaxLength(450);
+                   .HasMaxLength(400);
 
             builder.Property(token => token.Type)
-                   .HasMaxLength(25);
+                   .HasMaxLength(50);
 
             builder.ToTable("OpenIddictTokens");
         }