diff --git a/SqlDatabaseVectorSearch/Components/Pages/Documents.razor b/SqlDatabaseVectorSearch/Components/Pages/Documents.razor
index c927cac..6648044 100644
--- a/SqlDatabaseVectorSearch/Components/Pages/Documents.razor
+++ b/SqlDatabaseVectorSearch/Components/Pages/Documents.razor
@@ -13,7 +13,7 @@
     Upload new document
 </h4>
 
-<EditForm EditContext="@editContext" OnValidSubmit="HandleValidSubmit">
+<EditForm Model="Model" Enhance OnValidSubmit="HandleValidSubmit">
     <DataAnnotationsValidator />
 
     <div class="row">
@@ -24,7 +24,7 @@
                         <Icon Class="d-flex text-body-secondary" Name="IconName.InfoCircle"></Icon>
                     </Tooltip>
                 </span>
-                <InputFile class="form-control" OnChange="HandleFileSelected" accept=".pdf,.docx,.txt,.md" />
+                <InputFile class="form-control" OnChange="@((e) => Model.File = e.File)" accept=".pdf,.docx,.txt,.md" />
             </div>
         </div>
         <div class="col-md-5 col-sm-5 col-5">
@@ -35,13 +35,13 @@
                     </Tooltip>
                     Document ID
                 </span>
-                <TextInput Placeholder="Enter a valid GUID or leave empty for auto-generation" @bind-Value="@uploadDocumentRequest.DocumentId" />
+                <TextInput Placeholder="Enter a valid GUID or leave empty for auto-generation" @bind-Value="@Model.DocumentId" />
             </div>
-            <ValidationMessage For="@(() => uploadDocumentRequest.DocumentId)" />
+            <ValidationMessage For="@(() => Model.DocumentId)" />
         </div>
         <div class="col-md-2 col-sm-3 col-2">
             <div class="d-grid gap-2">
-                <Button @ref="uploadButton" Type="ButtonType.Submit" Color="ButtonColor.Primary" To="#" Disabled="@(uploadDocumentRequest.File is null)"><Icon Name="IconName.Upload" /><span class="d-none d-lg-inline ps-3">Upload</span></Button>
+                <Button @ref="uploadButton" Type="ButtonType.Submit" Color="ButtonColor.Primary" To="#" Disabled="@(Model.File is null)"><Icon Name="IconName.Upload" /><span class="d-none d-lg-inline ps-3">Upload</span></Button>
             </div>
         </div>
     </div>
@@ -107,18 +107,11 @@ else
     private bool isLoading = true;
     private IList<SelectableDocument> documents = [];
 
-    private UploadDocumentRequest uploadDocumentRequest = new();
-    private EditContext? editContext;
+    private UploadDocument Model { get; set; } = new();    
 
     [Inject]
     protected ToastService ToastService { get; set; } = default!;
 
-    protected override void OnInitialized()
-    {
-        editContext = new EditContext(uploadDocumentRequest);
-        base.OnInitialized();
-    }
-
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (!firstRender)
@@ -156,31 +149,26 @@ else
         }
     }
 
-    private void HandleFileSelected(InputFileChangeEventArgs e)
-    {
-        uploadDocumentRequest.File = e.File;
-    }
-
     private async Task HandleValidSubmit()
     {
-        if (uploadDocumentRequest.File is null)
+        if (Model.File is null)
         {
             return;
         }
 
         uploadButton.ShowLoading();
 
-        var fileName = uploadDocumentRequest.File.Name;
+        var fileName = Model.File.Name;
 
         try
         {
-            await using var inputStream = uploadDocumentRequest.File.OpenReadStream(20 * 1024 * 1024); // 20 MB
+            await using var inputStream = Model.File.OpenReadStream(20 * 1024 * 1024); // 20 MB
             await using var stream = await inputStream.GetMemoryStreamAsync();
 
             await using var scope = ServiceProvider.CreateAsyncScope();
             var vectorSearchService = scope.ServiceProvider.GetRequiredService<VectorSearchService>();
 
-            var documentId = string.IsNullOrWhiteSpace(uploadDocumentRequest.DocumentId) ? null : (Guid?)Guid.Parse(uploadDocumentRequest.DocumentId);
+            var documentId = string.IsNullOrWhiteSpace(Model.DocumentId) ? null : (Guid?)Guid.Parse(Model.DocumentId);
             await vectorSearchService.ImportAsync(stream, fileName, MimeUtility.GetMimeMapping(fileName), documentId);
 
             ToastService.Notify(await CreateToastMessageAsync(ToastType.Success, "Upload document", $"The document {fileName} has been successfully uploaded and indexed."));
@@ -269,9 +257,8 @@ else
         public string LocalCreationDateString { get; set; } = string.Empty;
     }
 
-    public class UploadDocumentRequest
+    public class UploadDocument
     {
-        [SupplyParameterFromForm]
         public IBrowserFile? File { get; set; }
 
         [RegularExpression(@"^(\{|\()?[0-9a-fA-F]{8}(-?)[0-9a-fA-F]{4}(-?)[0-9a-fA-F]{4}(-?)[0-9a-fA-F]{4}(-?)[0-9a-fA-F]{12}(\}|\))?$", ErrorMessage = "Invalid GUID format.")]