diff --git a/modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor b/modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor
index 4075632..65a3b6d 100644
--- a/modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor
+++ b/modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor
@@ -17,7 +17,7 @@
             <div id="FilterSection" class="row mt-3">
                 <Field ColumnSize="ColumnSize.Is3">
                     <FieldLabel>@L["ProductName"]</FieldLabel>
-                    <TextEdit Placeholder="@L["ProductName"]" @bind-Text="@GetListInput.ProductName"/>
+                    <TextInput Placeholder="@L["ProductName"]" @bind-Value="@GetListInput.ProductName"/>
                 </Field>
                 <Field ColumnSize="ColumnSize.Is3">
                     <FieldLabel>@L["Status"]</FieldLabel>
@@ -31,11 +31,11 @@
                 </Field>
                 <Field ColumnSize="ColumnSize.Is3">
                     <FieldLabel>@L["MinCreationTime"]</FieldLabel>
-                    <DateEdit Placeholder="@L["MinCreationTime"]" @bind-Date="@GetListInput.MinCreationTime"/>
+                    <DatePicker TValue="DateTime?" Placeholder="@L["MinCreationTime"]" @bind-Value="@GetListInput.MinCreationTime"/>
                 </Field>
                 <Field ColumnSize="ColumnSize.Is3">
                     <FieldLabel>@L["MaxCreationTime"]</FieldLabel>
-                    <DateEdit Placeholder="@L["MaxCreationTime"]" @bind-Date="@GetListInput.MaxCreationTime"/>
+                    <DatePicker TValue="DateTime?" Placeholder="@L["MaxCreationTime"]" @bind-Value="@GetListInput.MaxCreationTime"/>
                 </Field>
                 <Field ColumnSize="ColumnSize.Is12">
                     <Row>
diff --git a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
index 8c63eaa..f435f71 100644
--- a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
+++ b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
@@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using StackExchange.Redis;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
diff --git a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor
index 30a80ac..0a6367f 100644
--- a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor
+++ b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor
@@ -1,4 +1,4 @@
-@using EventHub.Admin.Users
+@using EventHub.Admin.Users
 @inherits EventHubComponentBase
 @inject IUserAppService UserAppService
 
@@ -13,7 +13,7 @@
                 <Column ColumnSize="ColumnSize.Is12">
                     <Field>
                         <FieldLabel>@L["UserName"]</FieldLabel>
-                        <TextEdit TValue="string" KeyPress="OnKeyPressed" @bind-Text="@Filter.Username" />
+                        <TextInput TValue="string" KeyPress="OnKeyPressed" @bind-Value="@Filter.Username" />
                     </Field>
                 </Column>
             </div>
@@ -30,34 +30,34 @@
                             <Check TValue="bool" @bind-Checked="@AllUserSelected"></Check>
                         </CaptionTemplate>
                         <DisplayTemplate>
-                            @if (SelectAllUsers.ContainsKey(context.Id))
+                            @if (SelectAllUsers.ContainsKey(context.Item.Id))
                             {
-                                <Check TValue="bool" @bind-Checked="@SelectAllUsers[context.Id]"></Check>
+                                <Check TValue="bool" @bind-Checked="@SelectAllUsers[context.Item.Id]"></Check>
                             }
                         </DisplayTemplate>
                     </DataGridColumn>
 
                     <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Username)" Caption="@L["UserName"].Value">
                         <DisplayTemplate>
-                            @(context.Username)
+                            @(context.Item.Username)
                         </DisplayTemplate>
                     </DataGridColumn>
 
                     <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Name)" Caption="@L["Name"].Value">
                         <DisplayTemplate>
-                            @(context.Name)
+                            @(context.Item.Name)
                         </DisplayTemplate>
                     </DataGridColumn>
 
                     <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Surname)" Caption="@L["Surname"].Value">
                         <DisplayTemplate>
-                            @(context.Surname)
+                            @(context.Item.Surname)
                         </DisplayTemplate>
                     </DataGridColumn>
 
                     <DataGridColumn TItem="UserDto" Field="@nameof(UserDto.Email)" Caption="@L["Email"].Value">
                         <DisplayTemplate>
-                            @(context.Email)
+                            @(context.Item.Email)
                         </DisplayTemplate>
                     </DataGridColumn>
                 </DataGridColumns>
diff --git a/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj b/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
index 4b72d2d..1e7800a 100644
--- a/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
+++ b/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
@@ -11,13 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.8.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="2.1.3" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.1.3" />
+    <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.9" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.9" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="10.4.1" />
     <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="10.4.1" />
     <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="10.4.1" />
     <PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="10.4.1" />
diff --git a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor
index 6526d7b..f94f691 100644
--- a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor
+++ b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor
@@ -35,7 +35,7 @@
                         <EntityActions TItem="EventAttendeeDto">
                             <EntityAction TItem="EventAttendeeDto"
                                           RequiredPolicy="@EventHubPermissions.Events.Registrations.RemoveAttendee"
-                                          Clicked="() => RemoveAttendeeAsync(context)"
+                                          Clicked="() => RemoveAttendeeAsync(context.Item)"
                                           ConfirmationMessage="@(() => L["AttendeeRemoveConfirmationMessage"])"
                                           Text="@L["RemoveUser"]">
                             </EntityAction>
diff --git a/src/EventHub.Admin.Web/Pages/EventManagement.razor b/src/EventHub.Admin.Web/Pages/EventManagement.razor
index 55b74e9..e488438 100644
--- a/src/EventHub.Admin.Web/Pages/EventManagement.razor
+++ b/src/EventHub.Admin.Web/Pages/EventManagement.razor
@@ -1,4 +1,4 @@
-@page "/events"
+@page "/events"
 @using EventHub.Admin.Events
 @using EventHub.Admin.Permissions
 @using EventHub.Events
@@ -22,37 +22,37 @@
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["Title"]</FieldLabel>
-                        <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.Title"/>
+                        <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.Title"/>
                     </Field>
                 </Column>
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["OrganizationDisplayName"]</FieldLabel>
-                        <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.OrganizationDisplayName"/>
+                        <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.OrganizationDisplayName"/>
                     </Field>
                 </Column>
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["MinStartTime"]</FieldLabel>
-                        <DateEdit TValue="DateTime?" Date="@Filter.MinStartTime" DateChanged="OnSelectedDateChangedForMinStartTime" />
+                        <DatePicker TValue="DateTime?" Value="@Filter.MinStartTime" ValueChanged="OnSelectedDateChangedForMinStartTime" />
                     </Field>
                 </Column>
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["MaxStartTime"]</FieldLabel>
-                        <DateEdit TValue="DateTime?" Date="@Filter.MaxStartTime" DateChanged="OnSelectedDateChangedForMaxStartTime" />
+                        <DatePicker TValue="DateTime?" Value="@Filter.MaxStartTime" ValueChanged="OnSelectedDateChangedForMaxStartTime" />
                     </Field>
                 </Column>
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["MinAttendeeCount"]</FieldLabel>
-                        <NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinAttendeeCount"/>
+                        <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinAttendeeCount"/>
                     </Field>
                 </Column>
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["MaxAttendeeCount"]</FieldLabel>
-                        <NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxAttendeeCount"/>
+                        <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxAttendeeCount"/>
                     </Field>
                 </Column>
             </div>
@@ -70,12 +70,12 @@
                         <EntityActions TItem="EventInListDto">
                             <EntityAction TItem="EventInListDto"
                                           RequiredPolicy="@EventHubPermissions.Events.Update"
-                                          Clicked="() => OpenEditEventModalAsync(context)"
+                                          Clicked="() => OpenEditEventModalAsync(context.Item)"
                                           Text="@L["Edit"]">
                             </EntityAction>
                             <EntityAction TItem="EventInListDto"
                                           RequiredPolicy="@EventHubPermissions.Events.Registrations.Default"
-                                          Clicked="@(() => NavigationManager.NavigateTo($"/event/{context.Id}/attendees"))"
+                                          Clicked="@(() => NavigationManager.NavigateTo($"/event/{context.Item.Id}/attendees"))"
                                           Text="@L["Attendees"]">
                             </EntityAction>
                         </EntityActions>
@@ -126,31 +126,31 @@
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["Title"] *</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingEvent.Title">
+                                        <TextInput TValue="string" @bind-Value="@EditingEvent.Title">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["Description"] *</FieldLabel>
-                                        <MemoEdit @bind-Text="@EditingEvent.Description">
+                                        <MemoInput @bind-Value="@EditingEvent.Description">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </MemoEdit>
+                                        </MemoInput>
                                     </Field>
                                 </Validation>
                                 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["IsOnline"]</FieldLabel>
-                                        <Select @bind-SelectedValue="@EditingEvent.IsOnline">
-                                            <SelectItem Value="@Boolean.TrueString">@L["Online"]</SelectItem>
-                                            <SelectItem Value="@Boolean.FalseString">@L["InPerson"]</SelectItem>
+                                        <Select TValue="bool" @bind-SelectedValue="@EditingEvent.IsOnline">
+                                            <SelectItem Value="true">@L["Online"]</SelectItem>
+                                            <SelectItem Value="false">@L["InPerson"]</SelectItem>
                                         </Select>
                                     </Field>
                                 </Validation>
@@ -158,7 +158,7 @@
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["Language"]</FieldLabel>
-                                        <Select @bind-SelectedValue="@EditingEvent.Language">
+                                        <Select TValue="string" @bind-SelectedValue="@EditingEvent.Language">
                                             @if (Languages != null && Languages.Any())
                                             {
                                                 foreach (var language in Languages)
@@ -175,11 +175,11 @@
                                     <Validation>
                                         <Field>
                                             <FieldLabel>@L["OnlineLink"] *</FieldLabel>
-                                            <MemoEdit @bind-Text="@EditingEvent.OnlineLink">
+                                            <MemoInput @bind-Value="@EditingEvent.OnlineLink">
                                                 <Feedback>
                                                     <ValidationError/>
                                                 </Feedback>
-                                            </MemoEdit>
+                                            </MemoInput>
                                         </Field>
                                     </Validation>
                                 }
@@ -188,7 +188,7 @@
                                     <Validation>
                                         <Field>
                                             <FieldLabel>@L["Country"] *</FieldLabel>
-                                            <Select @bind-SelectedValue="@EditingEvent.CountryId">
+                                            <Select TValue="Guid?" @bind-SelectedValue="@EditingEvent.CountryId">
                                                 @if (Countries != null && Countries.Any())
                                                 {
                                                     @foreach (var country in Countries)
@@ -203,11 +203,11 @@
                                     <Validation>
                                         <Field>
                                             <FieldLabel>@L["City"] *</FieldLabel>
-                                            <TextEdit TValue="string" @bind-Text="@EditingEvent.City">
+                                            <TextInput TValue="string" @bind-Value="@EditingEvent.City">
                                                 <Feedback>
                                                     <ValidationError/>
                                                 </Feedback>
-                                            </TextEdit>
+                                            </TextInput>
                                         </Field>
                                     </Validation>
                                 }
@@ -215,11 +215,11 @@
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["Capacity"]</FieldLabel>
-                                        <NumericEdit TValue="int?" @bind-Value="@EditingEvent.Capacity">
+                                        <NumericInput TValue="int?" @bind-Value="@EditingEvent.Capacity">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </NumericEdit>
+                                        </NumericInput>
                                     </Field>
                                 </Validation>
 
@@ -230,21 +230,21 @@
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["StartTime"] *</FieldLabel>
-                                        <DateEdit TValue="DateTime"  InputMode="DateInputMode.DateTime" @bind-Date="@EditingEvent.StartTime">
+                                        <DatePicker TValue="DateTime"  InputMode="DateInputMode.DateTime" @bind-Value="@EditingEvent.StartTime">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </DateEdit>
+                                        </DatePicker>
                                     </Field>
                                 </Validation>
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["EndTime"] *</FieldLabel>
-                                        <DateEdit TValue="DateTime"  InputMode="DateInputMode.DateTime" @bind-Date="@EditingEvent.EndTime">
+                                        <DatePicker TValue="DateTime"  InputMode="DateInputMode.DateTime" @bind-Value="@EditingEvent.EndTime">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </DateEdit>
+                                        </DatePicker>
                                     </Field>
                                 </Validation>
                             </Validations>
@@ -261,7 +261,7 @@
                                 <Field Horizontal="true">
                                     <FieldLabel ColumnSize="ColumnSize.Is3">@L["ChooseCoverImage"]</FieldLabel>
                                     <FieldBody ColumnSize="ColumnSize.Is6">
-                                        <FileEdit MaxMessageSize="@EventConsts.MaxCoverImageFileSize" Filter="@string.Join(", ", EventConsts.AllowedCoverImageExtensions)" Changed="@OnCoverImageFileChanged" AutoReset="true"/>
+                                        <FileInput MaxMessageSize="@EventConsts.MaxCoverImageFileSize" Filter="@string.Join(", ", EventConsts.AllowedCoverImageExtensions)" Changed="@OnCoverImageFileChanged" AutoReset="true"/>
                                     </FieldBody>
                                     <Column ColumnSize="ColumnSize.Is3">
                                         @if (DisabledCoverImageButton)
diff --git a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
index fd27350..1aba6ef 100644
--- a/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
+++ b/src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
@@ -27,28 +27,28 @@
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["Name"]</FieldLabel>
-                        <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.Name"/>
+                        <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.Name"/>
                     </Field>
                 </Column>
 
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["DisplayName"]</FieldLabel>
-                        <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.DisplayName"/>
+                        <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.DisplayName"/>
                     </Field>
                 </Column>
 
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["MinMemberCount"]</FieldLabel>
-                        <NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinMemberCount"/>
+                        <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MinMemberCount"/>
                     </Field>
                 </Column>
 
                 <Column ColumnSize="ColumnSize.Is3">
                     <Field>
                         <FieldLabel>@L["MaxMemberCount"]</FieldLabel>
-                        <NumericEdit TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxMemberCount"/>
+                        <NumericInput TValue="int?" KeyPress="OnKeyPress" @bind-Value="@Filter.MaxMemberCount"/>
                     </Field>
                 </Column>
             </div>
@@ -67,17 +67,17 @@
                         <EntityActions TItem="OrganizationInListDto">
                             <EntityAction TItem="OrganizationInListDto"
                                           RequiredPolicy="@EventHubPermissions.Organizations.Memberships.Default"
-                                          Clicked="@(() => NavigationManager.NavigateTo($"/organization-memberships/{context.Id}"))"
+                                          Clicked="@(() => NavigationManager.NavigateTo($"/organization-memberships/{context.Item.Id}"))"
                                           Text="@L["Members"]">
                             </EntityAction>
                             <EntityAction TItem="OrganizationInListDto"
                                           RequiredPolicy="@EventHubPermissions.Organizations.Update"
-                                          Clicked="() => OpenEditOrganizationModalAsync(context)"
+                                          Clicked="() => OpenEditOrganizationModalAsync(context.Item)"
                                           Text="@L["Edit"]">
                             </EntityAction>
                             <EntityAction TItem="OrganizationInListDto"
                                           RequiredPolicy="@EventHubPermissions.Organizations.Delete"
-                                          Clicked="() => DeleteOrganizationAsync(context)"
+                                          Clicked="() => DeleteOrganizationAsync(context.Item)"
                                           ConfirmationMessage="@(() => L["DeleteConfirmationMessage"])"
                                           Text="@L["Delete"]">
                             </EntityAction>
@@ -125,66 +125,66 @@
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["DisplayName"] *</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingOrganization.DisplayName">
+                                        <TextInput TValue="string" @bind-Value="@EditingOrganization.DisplayName">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["Description"] *</FieldLabel>
-                                        <MemoEdit Rows="4" TValue="string" @bind-Text="@EditingOrganization.Description">
+                                        <MemoInput Rows="4" TValue="string" @bind-Value="@EditingOrganization.Description">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </MemoEdit>
+                                        </MemoInput>
                                     </Field>
                                 </Validation>
 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["Website"]</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingOrganization.Website">
+                                        <TextInput TValue="string" @bind-Value="@EditingOrganization.Website">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["TwitterUsername"]</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingOrganization.TwitterUsername">
+                                        <TextInput TValue="string" @bind-Value="@EditingOrganization.TwitterUsername">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["GitHubUsername"]</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingOrganization.GitHubUsername">
+                                        <TextInput TValue="string" @bind-Value="@EditingOrganization.GitHubUsername">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["FacebookUsername"]</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingOrganization.FacebookUsername">
+                                        <TextInput TValue="string" @bind-Value="@EditingOrganization.FacebookUsername">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
@@ -192,22 +192,22 @@
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["InstagramUsername"]</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingOrganization.InstagramUsername">
+                                        <TextInput TValue="string" @bind-Value="@EditingOrganization.InstagramUsername">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
                                 <Validation>
                                     <Field>
                                         <FieldLabel>@L["MediumUsername"]</FieldLabel>
-                                        <TextEdit TValue="string" @bind-Text="@EditingOrganization.MediumUsername">
+                                        <TextInput TValue="string" @bind-Value="@EditingOrganization.MediumUsername">
                                             <Feedback>
                                                 <ValidationError/>
                                             </Feedback>
-                                        </TextEdit>
+                                        </TextInput>
                                     </Field>
                                 </Validation>
 
@@ -236,7 +236,7 @@
                                 <Field Horizontal="true">
                                     <FieldLabel ColumnSize="ColumnSize.Is3">@L["ChooseProfileImage"]</FieldLabel>
                                     <FieldBody ColumnSize="ColumnSize.Is6">
-                                        <FileEdit MaxMessageSize="@OrganizationConsts.MaxProfilePictureFileSize" Filter="@string.Join(", ", OrganizationConsts.AllowedProfilePictureExtensions)" Changed="@OnProfileImageFileChanged" Progressed="@OnProgressedForProfileImage" AutoReset="true"/>
+                                        <FileInput MaxMessageSize="@OrganizationConsts.MaxProfilePictureFileSize" Filter="@string.Join(", ", OrganizationConsts.AllowedProfilePictureExtensions)" Changed="@OnProfileImageFileChanged" Progressed="@OnProgressedForProfileImage" AutoReset="true"/>
                                     </FieldBody>
                                     <Column ColumnSize="ColumnSize.Is3">
                                         @if (DisabledProfileImageButton)
diff --git a/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor b/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor
index fa49bf4..5987fc3 100644
--- a/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor
+++ b/src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor
@@ -25,14 +25,14 @@
                 <Column ColumnSize="ColumnSize.Is6">
                     <Field>
                         <FieldLabel>@L["OrganizationName"]</FieldLabel>
-                        <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@OrganizationName"/>
+                        <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@OrganizationName"/>
                     </Field>
                 </Column>
 
                 <Column ColumnSize="ColumnSize.Is6">
                     <Field>
                         <FieldLabel>@L["UserName"]</FieldLabel>
-                        <TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@Filter.UserName"/>
+                        <TextInput TValue="string" KeyPress="OnKeyPress" @bind-Value="@Filter.UserName"/>
                     </Field>
                 </Column>
             </Row>
diff --git a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
index 8535baa..c0cfe40 100644
--- a/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
+++ b/src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
@@ -19,7 +19,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using StackExchange.Redis;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
diff --git a/src/EventHub.Web/EventHubWebModule.cs b/src/EventHub.Web/EventHubWebModule.cs
index 4125ec0..790a7ba 100644
--- a/src/EventHub.Web/EventHubWebModule.cs
+++ b/src/EventHub.Web/EventHubWebModule.cs
@@ -14,7 +14,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Payment.Web;
 using StackExchange.Redis;
 using Volo.Abp;