diff --git a/CS/CodeBehind/EFCore/InfiniteAsyncSource/App.xaml b/CS/CodeBehind/EFCore/InfiniteAsyncSource/App.xaml
index cd777dc..0808d61 100644
--- a/CS/CodeBehind/EFCore/InfiniteAsyncSource/App.xaml
+++ b/CS/CodeBehind/EFCore/InfiniteAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj b/CS/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj
index f744599..d965eb6 100644
--- a/CS/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj
+++ b/CS/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -212,4 +212,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml b/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml
index 341b4d9..5542e8f 100644
--- a/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml
+++ b/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,4 +32,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.cs b/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.cs
index 9be9255..88aee4f 100644
--- a/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.cs
@@ -57,7 +57,7 @@ void OnValidateRow(System.Object sender, DevExpress.Xpf.Grid.GridRowValidationEv
             }
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs e) {
             var row = (EFCoreIssues.Issues.Issue)e.Rows.Single();
             var context = new EFCoreIssues.Issues.IssuesContext();
             context.Entry(row).State = EntityState.Deleted;
diff --git a/CS/CodeBehind/EFCore/InstantFeedbackMode/App.xaml b/CS/CodeBehind/EFCore/InstantFeedbackMode/App.xaml
index cd777dc..0808d61 100644
--- a/CS/CodeBehind/EFCore/InstantFeedbackMode/App.xaml
+++ b/CS/CodeBehind/EFCore/InstantFeedbackMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.cs b/CS/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.cs
index f1e718a..f0fd668 100644
--- a/CS/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.cs
+++ b/CS/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EFCoreIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj b/CS/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj
index 0e39b2d..dae5f4a 100644
--- a/CS/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj
+++ b/CS/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -221,4 +221,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml b/CS/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml
index d5c1fd0..3ef3fc6 100644
--- a/CS/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml
+++ b/CS/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml b/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml
index 5cca301..492b2a3 100644
--- a/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml
+++ b/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.cs b/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.cs
index f8bd9a3..cc4e3fd 100644
--- a/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.cs
@@ -47,11 +47,11 @@ void OnCreateEditEntityViewModel(System.Object sender, DevExpress.Mvvm.Xpf.Creat
         }
 
         void OnValidateRow(System.Object sender, DevExpress.Mvvm.Xpf.EditFormRowValidationArgs e) {
-            var context = ((EditIssueInfo)e.Tag).Context;
+            var context = ((EditIssueInfo)e.EditOperationContext).DbContext;
             context.SaveChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs e) {
             var key = (int)e.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/CodeBehind/EFCore/LocalData/App.xaml b/CS/CodeBehind/EFCore/LocalData/App.xaml
index cd777dc..0808d61 100644
--- a/CS/CodeBehind/EFCore/LocalData/App.xaml
+++ b/CS/CodeBehind/EFCore/LocalData/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/CodeBehind/EFCore/LocalData/LocalData.csproj b/CS/CodeBehind/EFCore/LocalData/LocalData.csproj
index 3936cdd..c44afdf 100644
--- a/CS/CodeBehind/EFCore/LocalData/LocalData.csproj
+++ b/CS/CodeBehind/EFCore/LocalData/LocalData.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -212,4 +212,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml b/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml
index 9cd30dd..7e29237 100644
--- a/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml
+++ b/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" DataSourceRefresh="OnDataSourceRefresh" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -25,4 +25,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml.cs b/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml.cs
index 1a477e6..b1aaac8 100644
--- a/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EFCore/LocalData/MainWindow.xaml.cs
@@ -21,7 +21,7 @@ void OnValidateRow(System.Object sender, DevExpress.Xpf.Grid.GridRowValidationEv
             _Context.SaveChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs e) {
             var row = (EFCoreIssues.Issues.User)e.Rows.Single();
             _Context.Users.Remove(row);
             _Context.SaveChanges();
diff --git a/CS/CodeBehind/EFCore/PagedAsyncSource/App.xaml b/CS/CodeBehind/EFCore/PagedAsyncSource/App.xaml
index cd777dc..0808d61 100644
--- a/CS/CodeBehind/EFCore/PagedAsyncSource/App.xaml
+++ b/CS/CodeBehind/EFCore/PagedAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml b/CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml
index a6319fe..05d3381 100644
--- a/CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml
+++ b/CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml
@@ -8,7 +8,7 @@
       <dxg:GridControl.View>
         <dxg:TableView ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -27,4 +27,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.csproj b/CS/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.csproj
index 81e2cce..f844c11 100644
--- a/CS/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.csproj
+++ b/CS/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -212,4 +212,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/CodeBehind/EFCore/ServerMode/App.xaml b/CS/CodeBehind/EFCore/ServerMode/App.xaml
index cd777dc..0808d61 100644
--- a/CS/CodeBehind/EFCore/ServerMode/App.xaml
+++ b/CS/CodeBehind/EFCore/ServerMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/CodeBehind/EFCore/ServerMode/EditIssueInfo.cs b/CS/CodeBehind/EFCore/ServerMode/EditIssueInfo.cs
index f1e718a..f0fd668 100644
--- a/CS/CodeBehind/EFCore/ServerMode/EditIssueInfo.cs
+++ b/CS/CodeBehind/EFCore/ServerMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EFCoreIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml b/CS/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml
index d5c1fd0..3ef3fc6 100644
--- a/CS/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml
+++ b/CS/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml b/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml
index 5cca301..492b2a3 100644
--- a/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml
+++ b/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml.cs b/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml.cs
index 435afc3..474d706 100644
--- a/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml.cs
@@ -44,11 +44,11 @@ void OnCreateEditEntityViewModel(System.Object sender, DevExpress.Mvvm.Xpf.Creat
         }
 
         void OnValidateRow(System.Object sender, DevExpress.Mvvm.Xpf.EditFormRowValidationArgs e) {
-            var context = ((EditIssueInfo)e.Tag).Context;
+            var context = ((EditIssueInfo)e.EditOperationContext).DbContext;
             context.SaveChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs e) {
             var key = (int)e.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/CodeBehind/EFCore/ServerMode/ServerMode.csproj b/CS/CodeBehind/EFCore/ServerMode/ServerMode.csproj
index 884ca3c..b89c75c 100644
--- a/CS/CodeBehind/EFCore/ServerMode/ServerMode.csproj
+++ b/CS/CodeBehind/EFCore/ServerMode/ServerMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -221,4 +221,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/App.xaml b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/App.xaml
+++ b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj
index 6b708da..ba83cd8 100644
--- a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj
+++ b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -148,8 +148,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
index efd13da..562ba24 100644
--- a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
+++ b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,4 +32,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.cs b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.cs
index 1d1d7b4..46f1e46 100644
--- a/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.cs
@@ -57,7 +57,7 @@ void OnValidateRow(System.Object sender, DevExpress.Xpf.Grid.GridRowValidationEv
             }
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs e) {
             var row = (EntityFrameworkIssues.Issues.Issue)e.Rows.Single();
             var context = new EntityFrameworkIssues.Issues.IssuesContext();
             context.Entry(row).State = EntityState.Deleted;
diff --git a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/App.xaml b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/App.xaml
+++ b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs
index 6c86f13..b9daaf6 100644
--- a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs
+++ b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EntityFrameworkIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj
index 9a73bc7..f9cf5f2 100644
--- a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj
+++ b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -157,8 +157,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
index 23a72d0..807620e 100644
--- a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
+++ b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml
index 011c714..933903f 100644
--- a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml
+++ b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.cs b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.cs
index 556f4a4..542095f 100644
--- a/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.cs
@@ -47,11 +47,11 @@ void OnCreateEditEntityViewModel(System.Object sender, DevExpress.Mvvm.Xpf.Creat
         }
 
         void OnValidateRow(System.Object sender, DevExpress.Mvvm.Xpf.EditFormRowValidationArgs e) {
-            var context = ((EditIssueInfo)e.Tag).Context;
+            var context = ((EditIssueInfo)e.EditOperationContext).DbContext;
             context.SaveChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs e) {
             var key = (int)e.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/CodeBehind/EntityFramework/LocalData/App.xaml b/CS/CodeBehind/EntityFramework/LocalData/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/CodeBehind/EntityFramework/LocalData/App.xaml
+++ b/CS/CodeBehind/EntityFramework/LocalData/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/CodeBehind/EntityFramework/LocalData/LocalData.csproj b/CS/CodeBehind/EntityFramework/LocalData/LocalData.csproj
index 425e6cc..01b279f 100644
--- a/CS/CodeBehind/EntityFramework/LocalData/LocalData.csproj
+++ b/CS/CodeBehind/EntityFramework/LocalData/LocalData.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -148,8 +148,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml b/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml
index b21e0ba..eaa9222 100644
--- a/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml
+++ b/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" DataSourceRefresh="OnDataSourceRefresh" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -25,4 +25,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.cs b/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.cs
index 1d1b154..1a6d805 100644
--- a/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.cs
@@ -21,7 +21,7 @@ void OnValidateRow(System.Object sender, DevExpress.Xpf.Grid.GridRowValidationEv
             _Context.SaveChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs e) {
             var row = (EntityFrameworkIssues.Issues.User)e.Rows.Single();
             _Context.Users.Remove(row);
             _Context.SaveChanges();
diff --git a/CS/CodeBehind/EntityFramework/PagedAsyncSource/App.xaml b/CS/CodeBehind/EntityFramework/PagedAsyncSource/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/CodeBehind/EntityFramework/PagedAsyncSource/App.xaml
+++ b/CS/CodeBehind/EntityFramework/PagedAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml b/CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml
index b543f13..a23a58a 100644
--- a/CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml
+++ b/CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml
@@ -8,7 +8,7 @@
       <dxg:GridControl.View>
         <dxg:TableView ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -27,4 +27,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj b/CS/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj
index 5c15039..4b0853d 100644
--- a/CS/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj
+++ b/CS/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -148,8 +148,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/EntityFramework/ServerMode/App.xaml b/CS/CodeBehind/EntityFramework/ServerMode/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/CodeBehind/EntityFramework/ServerMode/App.xaml
+++ b/CS/CodeBehind/EntityFramework/ServerMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.cs b/CS/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.cs
index 6c86f13..b9daaf6 100644
--- a/CS/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.cs
+++ b/CS/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EntityFrameworkIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml b/CS/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml
index 23a72d0..807620e 100644
--- a/CS/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml
+++ b/CS/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml b/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml
index 011c714..933903f 100644
--- a/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml
+++ b/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.cs b/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.cs
index 6706ef3..d2c0441 100644
--- a/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.cs
+++ b/CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.cs
@@ -44,11 +44,11 @@ void OnCreateEditEntityViewModel(System.Object sender, DevExpress.Mvvm.Xpf.Creat
         }
 
         void OnValidateRow(System.Object sender, DevExpress.Mvvm.Xpf.EditFormRowValidationArgs e) {
-            var context = ((EditIssueInfo)e.Tag).Context;
+            var context = ((EditIssueInfo)e.EditOperationContext).DbContext;
             context.SaveChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs e) {
             var key = (int)e.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/CodeBehind/EntityFramework/ServerMode/ServerMode.csproj b/CS/CodeBehind/EntityFramework/ServerMode/ServerMode.csproj
index 0edd32d..495e3ad 100644
--- a/CS/CodeBehind/EntityFramework/ServerMode/ServerMode.csproj
+++ b/CS/CodeBehind/EntityFramework/ServerMode/ServerMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -157,8 +157,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/XPO/InfiniteAsyncSource/App.xaml b/CS/CodeBehind/XPO/InfiniteAsyncSource/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/CodeBehind/XPO/InfiniteAsyncSource/App.xaml
+++ b/CS/CodeBehind/XPO/InfiniteAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj b/CS/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj
index dc74ed7..a2b4187 100644
--- a/CS/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj
+++ b/CS/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -152,8 +152,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml b/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml
index bc07e8f..ce176d3 100644
--- a/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml
+++ b/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,4 +32,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.cs b/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.cs
index 51c6d32..55b8e4a 100644
--- a/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.cs
+++ b/CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.cs
@@ -66,7 +66,7 @@ void OnValidateRow(System.Object sender, DevExpress.Xpf.Grid.GridRowValidationEv
             }
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs e) {
             using(var unitOfWork = new DevExpress.Xpo.UnitOfWork()) {
                 var key = _DetachedObjectsHelper.GetKey(e.Rows.Single());
                 var item = unitOfWork.GetObjectByKey<XPOIssues.Issues.Issue>(key);
diff --git a/CS/CodeBehind/XPO/InstantFeedbackMode/App.xaml b/CS/CodeBehind/XPO/InstantFeedbackMode/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/CodeBehind/XPO/InstantFeedbackMode/App.xaml
+++ b/CS/CodeBehind/XPO/InstantFeedbackMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj b/CS/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj
index c54e529..d58e286 100644
--- a/CS/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj
+++ b/CS/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -161,8 +161,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml b/CS/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml
index 8110d2f..5b0f4e5 100644
--- a/CS/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml
+++ b/CS/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml b/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml
index 72d6a40..aaec940 100644
--- a/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml
+++ b/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.cs b/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.cs
index cf6b763..f3b4f2c 100644
--- a/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.cs
+++ b/CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.cs
@@ -51,11 +51,11 @@ void OnCreateEditEntityViewModel(System.Object sender, DevExpress.Mvvm.Xpf.Creat
         }
 
         void OnValidateRow(System.Object sender, DevExpress.Mvvm.Xpf.EditFormRowValidationArgs e) {
-            var unitOfWork = ((EditIssueInfo)e.Tag).UnitOfWork;
+            var unitOfWork = ((EditIssueInfo)e.EditOperationContext).UnitOfWork;
             unitOfWork.CommitChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs e) {
             using(var unitOfWork = new UnitOfWork()) {
                 var key = (int)e.Keys.Single();
                 var item = unitOfWork.GetObjectByKey<Issue>(key);
diff --git a/CS/CodeBehind/XPO/LocalData/App.xaml b/CS/CodeBehind/XPO/LocalData/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/CodeBehind/XPO/LocalData/App.xaml
+++ b/CS/CodeBehind/XPO/LocalData/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/CodeBehind/XPO/LocalData/LocalData.csproj b/CS/CodeBehind/XPO/LocalData/LocalData.csproj
index 6c0f3a7..9d4484e 100644
--- a/CS/CodeBehind/XPO/LocalData/LocalData.csproj
+++ b/CS/CodeBehind/XPO/LocalData/LocalData.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -152,8 +152,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/XPO/LocalData/MainWindow.xaml b/CS/CodeBehind/XPO/LocalData/MainWindow.xaml
index db77bc2..07a7cf6 100644
--- a/CS/CodeBehind/XPO/LocalData/MainWindow.xaml
+++ b/CS/CodeBehind/XPO/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" DataSourceRefresh="OnDataSourceRefresh" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -25,4 +25,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/XPO/LocalData/MainWindow.xaml.cs b/CS/CodeBehind/XPO/LocalData/MainWindow.xaml.cs
index c33a79a..6f75efe 100644
--- a/CS/CodeBehind/XPO/LocalData/MainWindow.xaml.cs
+++ b/CS/CodeBehind/XPO/LocalData/MainWindow.xaml.cs
@@ -20,7 +20,7 @@ void OnValidateRow(System.Object sender, DevExpress.Xpf.Grid.GridRowValidationEv
             _UnitOfWork.CommitChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs e) {
             var row = (XPOIssues.Issues.User)e.Rows.Single();
             _UnitOfWork.Delete(row);
             _UnitOfWork.CommitChanges();
diff --git a/CS/CodeBehind/XPO/PagedAsyncSource/App.xaml b/CS/CodeBehind/XPO/PagedAsyncSource/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/CodeBehind/XPO/PagedAsyncSource/App.xaml
+++ b/CS/CodeBehind/XPO/PagedAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml b/CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml
index 16ed77a..9589294 100644
--- a/CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml
+++ b/CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml
@@ -8,7 +8,7 @@
       <dxg:GridControl.View>
         <dxg:TableView ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -27,4 +27,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.csproj b/CS/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.csproj
index 27152af..997e9be 100644
--- a/CS/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.csproj
+++ b/CS/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -152,8 +152,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/CodeBehind/XPO/ServerMode/App.xaml b/CS/CodeBehind/XPO/ServerMode/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/CodeBehind/XPO/ServerMode/App.xaml
+++ b/CS/CodeBehind/XPO/ServerMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/CodeBehind/XPO/ServerMode/IssueDetailView.xaml b/CS/CodeBehind/XPO/ServerMode/IssueDetailView.xaml
index 8110d2f..5b0f4e5 100644
--- a/CS/CodeBehind/XPO/ServerMode/IssueDetailView.xaml
+++ b/CS/CodeBehind/XPO/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml b/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml
index 72d6a40..aaec940 100644
--- a/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml
+++ b/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml.cs b/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml.cs
index e6eeec0..1b75f70 100644
--- a/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml.cs
+++ b/CS/CodeBehind/XPO/ServerMode/MainWindow.xaml.cs
@@ -49,11 +49,11 @@ void OnCreateEditEntityViewModel(System.Object sender, DevExpress.Mvvm.Xpf.Creat
         }
 
         void OnValidateRow(System.Object sender, DevExpress.Mvvm.Xpf.EditFormRowValidationArgs e) {
-            var unitOfWork = ((EditIssueInfo)e.Tag).UnitOfWork;
+            var unitOfWork = ((EditIssueInfo)e.EditOperationContext).UnitOfWork;
             unitOfWork.CommitChanges();
         }
 
-        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs e) {
+        void OnValidateRowDeletion(System.Object sender, DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs e) {
             using(var unitOfWork = new UnitOfWork()) {
                 var key = (int)e.Keys.Single();
                 var item = unitOfWork.GetObjectByKey<Issue>(key);
diff --git a/CS/CodeBehind/XPO/ServerMode/ServerMode.csproj b/CS/CodeBehind/XPO/ServerMode/ServerMode.csproj
index daeb862..76b2226 100644
--- a/CS/CodeBehind/XPO/ServerMode/ServerMode.csproj
+++ b/CS/CodeBehind/XPO/ServerMode/ServerMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -161,8 +161,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/NuGet.Config b/CS/NuGet.Config
similarity index 88%
rename from NuGet.Config
rename to CS/NuGet.Config
index 624214b..f6e98fc 100644
--- a/NuGet.Config
+++ b/CS/NuGet.Config
@@ -3,4 +3,4 @@
   <config>
     <add key="repositorypath" value="packages" />
   </config>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/CS/ViewModel/EFCore/InfiniteAsyncSource/App.xaml b/CS/ViewModel/EFCore/InfiniteAsyncSource/App.xaml
index cd777dc..0808d61 100644
--- a/CS/ViewModel/EFCore/InfiniteAsyncSource/App.xaml
+++ b/CS/ViewModel/EFCore/InfiniteAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj b/CS/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj
index 477422f..a4726ad 100644
--- a/CS/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj
+++ b/CS/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -213,4 +213,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.cs b/CS/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.cs
index 6f7d74f..aac8bc6 100644
--- a/CS/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.cs
+++ b/CS/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.cs
@@ -43,7 +43,7 @@ public void ValidateRow(DevExpress.Mvvm.Xpf.RowValidationArgs args) {
             }
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs args) {
             var item = (EFCoreIssues.Issues.Issue)args.Items.Single();
             var context = new EFCoreIssues.Issues.IssuesContext();
             context.Entry(item).State = EntityState.Deleted;
diff --git a/CS/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml b/CS/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml
index e7ade31..aa3ea3a 100644
--- a/CS/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml
+++ b/CS/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml
@@ -13,7 +13,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:InfiniteAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" FetchRowsCommand="{Binding FetchRowsCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -38,4 +38,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EFCore/InstantFeedbackMode/App.xaml b/CS/ViewModel/EFCore/InstantFeedbackMode/App.xaml
index cd777dc..0808d61 100644
--- a/CS/ViewModel/EFCore/InstantFeedbackMode/App.xaml
+++ b/CS/ViewModel/EFCore/InstantFeedbackMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.cs b/CS/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.cs
index f1e718a..f0fd668 100644
--- a/CS/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.cs
+++ b/CS/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EFCoreIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj b/CS/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj
index 4db5f10..3c349e9 100644
--- a/CS/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj
+++ b/CS/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -222,4 +222,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml b/CS/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml
index d5c1fd0..3ef3fc6 100644
--- a/CS/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml
+++ b/CS/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.cs b/CS/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.cs
index a63890b..8abbdf5 100644
--- a/CS/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.cs
+++ b/CS/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.cs
@@ -61,11 +61,11 @@ public void CreateEditEntityViewModel(DevExpress.Mvvm.Xpf.CreateEditItemViewMode
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
         public void ValidateRow(DevExpress.Mvvm.Xpf.EditFormRowValidationArgs args) {
-            var context = ((EditIssueInfo)args.Tag).Context;
+            var context = ((EditIssueInfo)args.EditOperationContext).DbContext;
             context.SaveChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs args) {
             var key = (int)args.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml b/CS/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml
index 107c426..39d56a8 100644
--- a/CS/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml
+++ b/CS/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EFCore/LocalData/App.xaml b/CS/ViewModel/EFCore/LocalData/App.xaml
index cd777dc..0808d61 100644
--- a/CS/ViewModel/EFCore/LocalData/App.xaml
+++ b/CS/ViewModel/EFCore/LocalData/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/ViewModel/EFCore/LocalData/Issues/User.cs b/CS/ViewModel/EFCore/LocalData/Issues/User.cs
index e3e8021..c07e1e9 100644
--- a/CS/ViewModel/EFCore/LocalData/Issues/User.cs
+++ b/CS/ViewModel/EFCore/LocalData/Issues/User.cs
@@ -1,10 +1,22 @@
+using DevExpress.Mvvm;
 using System.Collections.Generic;
 
 namespace EFCoreIssues.Issues {
-    public class User {
-        public int Id { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public virtual ICollection<Issue> Issues { get; set; }
+    public class User : BindableBase {
+        public int Id { get => GetValue<int>(); set => SetValue(value); }
+        public string FirstName { get => GetValue<string>(); set => SetValue(value); }
+        public string LastName { get => GetValue<string>(); set => SetValue(value); }
+        public virtual ICollection<Issue> Issues { get => GetValue<ICollection<Issue>>(); set => SetValue(value); }
+
+        public User Clone() {
+            return new User() { FirstName = FirstName, Id = Id, Issues = Issues, LastName = LastName };
+        }
+
+        public void CopyTo(User anotherUser) {
+            anotherUser.FirstName = FirstName;
+            anotherUser.Id = Id;
+            anotherUser.Issues = Issues;
+            anotherUser.LastName = LastName;
+        }
     }
 }
diff --git a/CS/ViewModel/EFCore/LocalData/LocalData.csproj b/CS/ViewModel/EFCore/LocalData/LocalData.csproj
index 2e9b56c..cf7b5b4 100644
--- a/CS/ViewModel/EFCore/LocalData/LocalData.csproj
+++ b/CS/ViewModel/EFCore/LocalData/LocalData.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -213,4 +213,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/ViewModel/EFCore/LocalData/MainViewModel.cs b/CS/ViewModel/EFCore/LocalData/MainViewModel.cs
index cf09f33..5f52b21 100644
--- a/CS/ViewModel/EFCore/LocalData/MainViewModel.cs
+++ b/CS/ViewModel/EFCore/LocalData/MainViewModel.cs
@@ -1,32 +1,82 @@
 using DevExpress.Mvvm;
+using EFCoreIssues.Issues;
+using System;
+using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace EFCoreIssues {
     public class MainViewModel : ViewModelBase {
         EFCoreIssues.Issues.IssuesContext _Context;
-        System.Collections.Generic.IList<EFCoreIssues.Issues.User> _ItemsSource;
+        ObservableCollection<EFCoreIssues.Issues.User> _ItemsSource;
 
-        public System.Collections.Generic.IList<EFCoreIssues.Issues.User> ItemsSource
+        public ObservableCollection<EFCoreIssues.Issues.User> ItemsSource
         {
             get
             {
                 if(_ItemsSource == null && !IsInDesignMode) {
                     _Context = new EFCoreIssues.Issues.IssuesContext();
-                    _ItemsSource = _Context.Users.ToList();
+                    _ItemsSource = new ObservableCollection<User>(_Context.Users);
                 }
                 return _ItemsSource;
             }
         }
+
+        void RemoveItem(User item) {
+            ItemsSource.Remove(item);
+            _Context.Users.Remove(item);
+            _Context.SaveChanges();
+        }
+
+        void InsertItem(int position, User item) {
+            ItemsSource.Insert(position, item);
+            _Context.Users.Add(item);
+            _Context.SaveChanges();
+        }
+
+        void ApplyEditingCache(User item) {
+            editingCache.CopyTo(item);
+            _Context.SaveChanges();
+        }
+
+        Action undoAction;
+        User editingCache;
+
+
+        [DevExpress.Mvvm.DataAnnotations.Command]
+        public void Undo() {
+            undoAction?.Invoke();
+            undoAction = null;
+        }
+
+        public bool CanUndo() {
+            return undoAction != null;
+        }
+
+        [DevExpress.Mvvm.DataAnnotations.Command]
+        public void StartRowEdit(DevExpress.Mvvm.Xpf.RowEditStartedArgs args) {
+            if(args.Item != null) {
+                editingCache = ((User)args.Item).Clone();
+            }
+        }
+
         [DevExpress.Mvvm.DataAnnotations.Command]
         public void ValidateRow(DevExpress.Mvvm.Xpf.RowValidationArgs args) {
             var item = (EFCoreIssues.Issues.User)args.Item;
-            if(args.IsNewItem)
+            
+            undoAction = args.IsNewItem ? new Action(() => RemoveItem(item)) : new Action(() => ApplyEditingCache(item));
+
+            if(args.IsNewItem) {
                 _Context.Users.Add(item);
+            }
             _Context.SaveChanges();
         }
+
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs args) {
             var item = (EFCoreIssues.Issues.User)args.Items.Single();
+
+            undoAction = new Action(() => InsertItem(args.SourceIndexes.Single(), item.Clone()));
+
             _Context.Users.Remove(item);
             _Context.SaveChanges();
         }
diff --git a/CS/ViewModel/EFCore/LocalData/MainWindow.xaml b/CS/ViewModel/EFCore/LocalData/MainWindow.xaml
index 6328902..534fa65 100644
--- a/CS/ViewModel/EFCore/LocalData/MainWindow.xaml
+++ b/CS/ViewModel/EFCore/LocalData/MainWindow.xaml
@@ -5,16 +5,18 @@
       <dxb:BarButtonItem Content="Edit (F2)" Command="{Binding View.Commands.EditFocusedRow, ElementName=grid}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Edit.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="New" Command="{Binding View.Commands.AddNewRow, ElementName=grid}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Add.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="Delete (Del)" Command="{Binding View.Commands.DeleteFocusedRow, ElementName=grid}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Delete.svg}" BarItemDisplayMode="ContentAndGlyph" />
+      <dxb:BarButtonItem Content="Undo (Ctrl+Z)" Command="{Binding UndoCommand}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Undo.svg}" BarItemDisplayMode="ContentAndGlyph" />
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" ItemsSource="{Binding ItemsSource}" RestoreStateKeyFieldName="Id" RestoreStateOnSourceChange="True" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRowCommand="{Binding ValidateRowCommand}" ValidateRowDeletionCommand="{Binding ValidateRowDeletionCommand}" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" ShowFixedTotalSummary="True" />
+          <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" RowEditStartedCommand="{Binding StartRowEditCommand}" ValidateRowCommand="{Binding ValidateRowCommand}" ValidateRowDeletionCommand="{Binding ValidateRowDeletionCommand}" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
         <KeyBinding Command="{Binding View.Commands.DeleteFocusedRow, ElementName=grid}" Key="Delete" />
+        <KeyBinding Command="{Binding UndoCommand}" Key="Z" Modifiers="Ctrl" />
       </dxg:GridControl.InputBindings>
       <dxg:GridControl.TotalSummary>
         <dxg:GridSummaryItem SummaryType="Count" Alignment="Right" />
@@ -28,4 +30,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EFCore/PagedAsyncSource/App.xaml b/CS/ViewModel/EFCore/PagedAsyncSource/App.xaml
index cd777dc..0808d61 100644
--- a/CS/ViewModel/EFCore/PagedAsyncSource/App.xaml
+++ b/CS/ViewModel/EFCore/PagedAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml b/CS/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml
index c2b156a..9815196 100644
--- a/CS/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml
+++ b/CS/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml
@@ -11,7 +11,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:PagedAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" PageNavigationMode="ArbitraryWithTotalPageCount" FetchPageCommand="{Binding FetchPageCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -33,4 +33,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.csproj b/CS/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.csproj
index e27e32d..fd89fa2 100644
--- a/CS/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.csproj
+++ b/CS/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -213,4 +213,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/ViewModel/EFCore/ServerMode/App.xaml b/CS/ViewModel/EFCore/ServerMode/App.xaml
index cd777dc..0808d61 100644
--- a/CS/ViewModel/EFCore/ServerMode/App.xaml
+++ b/CS/ViewModel/EFCore/ServerMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EFCoreIssues.App"
+<Application x:Class="EFCoreIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/CS/ViewModel/EFCore/ServerMode/EditIssueInfo.cs b/CS/ViewModel/EFCore/ServerMode/EditIssueInfo.cs
index f1e718a..f0fd668 100644
--- a/CS/ViewModel/EFCore/ServerMode/EditIssueInfo.cs
+++ b/CS/ViewModel/EFCore/ServerMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EFCoreIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/ViewModel/EFCore/ServerMode/IssueDetailView.xaml b/CS/ViewModel/EFCore/ServerMode/IssueDetailView.xaml
index d5c1fd0..3ef3fc6 100644
--- a/CS/ViewModel/EFCore/ServerMode/IssueDetailView.xaml
+++ b/CS/ViewModel/EFCore/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/ViewModel/EFCore/ServerMode/MainViewModel.cs b/CS/ViewModel/EFCore/ServerMode/MainViewModel.cs
index d583b06..af61bd5 100644
--- a/CS/ViewModel/EFCore/ServerMode/MainViewModel.cs
+++ b/CS/ViewModel/EFCore/ServerMode/MainViewModel.cs
@@ -58,11 +58,11 @@ public void CreateEditEntityViewModel(DevExpress.Mvvm.Xpf.CreateEditItemViewMode
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
         public void ValidateRow(DevExpress.Mvvm.Xpf.EditFormRowValidationArgs args) {
-            var context = ((EditIssueInfo)args.Tag).Context;
+            var context = ((EditIssueInfo)args.EditOperationContext).DbContext;
             context.SaveChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs args) {
             var key = (int)args.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/ViewModel/EFCore/ServerMode/MainWindow.xaml b/CS/ViewModel/EFCore/ServerMode/MainWindow.xaml
index 107c426..270d6f6 100644
--- a/CS/ViewModel/EFCore/ServerMode/MainWindow.xaml
+++ b/CS/ViewModel/EFCore/ServerMode/MainWindow.xaml
@@ -6,11 +6,11 @@
       <dxb:BarButtonItem Content="New" Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Add.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="Delete (Del)" Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Delete.svg}" BarItemDisplayMode="ContentAndGlyph" />
     </dxb:ToolBarControl>
-    <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
+    <dxg:GridControl x:Name="grid" ItemsSource="{Binding ServerModeSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EFCore/ServerMode/ServerMode.csproj b/CS/ViewModel/EFCore/ServerMode/ServerMode.csproj
index 0e7edcf..7273eb9 100644
--- a/CS/ViewModel/EFCore/ServerMode/ServerMode.csproj
+++ b/CS/ViewModel/EFCore/ServerMode/ServerMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,80 +41,80 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -222,4 +222,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/App.xaml b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/App.xaml
+++ b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj
index 205c2aa..74ffe8a 100644
--- a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj
+++ b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -149,8 +149,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.cs b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.cs
index 69495e6..b5d93b9 100644
--- a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.cs
+++ b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.cs
@@ -43,7 +43,7 @@ public void ValidateRow(DevExpress.Mvvm.Xpf.RowValidationArgs args) {
             }
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs args) {
             var item = (EntityFrameworkIssues.Issues.Issue)args.Items.Single();
             var context = new EntityFrameworkIssues.Issues.IssuesContext();
             context.Entry(item).State = EntityState.Deleted;
diff --git a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
index 8bab7f7..f5656c9 100644
--- a/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
+++ b/CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
@@ -13,7 +13,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:InfiniteAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" FetchRowsCommand="{Binding FetchRowsCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -38,4 +38,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EntityFramework/InstantFeedbackMode/App.xaml b/CS/ViewModel/EntityFramework/InstantFeedbackMode/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/ViewModel/EntityFramework/InstantFeedbackMode/App.xaml
+++ b/CS/ViewModel/EntityFramework/InstantFeedbackMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs b/CS/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs
index 6c86f13..b9daaf6 100644
--- a/CS/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs
+++ b/CS/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EntityFrameworkIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj b/CS/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj
index 6c96e91..f4ab8a5 100644
--- a/CS/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj
+++ b/CS/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -158,8 +158,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml b/CS/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
index 23a72d0..807620e 100644
--- a/CS/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
+++ b/CS/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.cs b/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.cs
index 49efd53..63f42aa 100644
--- a/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.cs
+++ b/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.cs
@@ -61,11 +61,11 @@ public void CreateEditEntityViewModel(DevExpress.Mvvm.Xpf.CreateEditItemViewMode
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
         public void ValidateRow(DevExpress.Mvvm.Xpf.EditFormRowValidationArgs args) {
-            var context = ((EditIssueInfo)args.Tag).Context;
+            var context = ((EditIssueInfo)args.EditOperationContext).DbContext;
             context.SaveChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs args) {
             var key = (int)args.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml b/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml
index 61e5e53..c758800 100644
--- a/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml
+++ b/CS/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EntityFramework/LocalData/App.xaml b/CS/ViewModel/EntityFramework/LocalData/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/ViewModel/EntityFramework/LocalData/App.xaml
+++ b/CS/ViewModel/EntityFramework/LocalData/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/ViewModel/EntityFramework/LocalData/LocalData.csproj b/CS/ViewModel/EntityFramework/LocalData/LocalData.csproj
index 1c555ed..68c10d4 100644
--- a/CS/ViewModel/EntityFramework/LocalData/LocalData.csproj
+++ b/CS/ViewModel/EntityFramework/LocalData/LocalData.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -149,8 +149,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/EntityFramework/LocalData/MainViewModel.cs b/CS/ViewModel/EntityFramework/LocalData/MainViewModel.cs
index 81dad5f..dba567e 100644
--- a/CS/ViewModel/EntityFramework/LocalData/MainViewModel.cs
+++ b/CS/ViewModel/EntityFramework/LocalData/MainViewModel.cs
@@ -25,7 +25,7 @@ public void ValidateRow(DevExpress.Mvvm.Xpf.RowValidationArgs args) {
             _Context.SaveChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs args) {
             var item = (EntityFrameworkIssues.Issues.User)args.Items.Single();
             _Context.Users.Remove(item);
             _Context.SaveChanges();
diff --git a/CS/ViewModel/EntityFramework/LocalData/MainWindow.xaml b/CS/ViewModel/EntityFramework/LocalData/MainWindow.xaml
index a8b2702..3748de6 100644
--- a/CS/ViewModel/EntityFramework/LocalData/MainWindow.xaml
+++ b/CS/ViewModel/EntityFramework/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRowCommand="{Binding ValidateRowCommand}" ValidateRowDeletionCommand="{Binding ValidateRowDeletionCommand}" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -28,4 +28,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EntityFramework/PagedAsyncSource/App.xaml b/CS/ViewModel/EntityFramework/PagedAsyncSource/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/ViewModel/EntityFramework/PagedAsyncSource/App.xaml
+++ b/CS/ViewModel/EntityFramework/PagedAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml b/CS/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml
index 23ac21f..74bca06 100644
--- a/CS/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml
+++ b/CS/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml
@@ -11,7 +11,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:PagedAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" PageNavigationMode="ArbitraryWithTotalPageCount" FetchPageCommand="{Binding FetchPageCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -33,4 +33,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj b/CS/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj
index bf1a2d9..4ffe511 100644
--- a/CS/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj
+++ b/CS/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -149,8 +149,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/EntityFramework/ServerMode/App.xaml b/CS/ViewModel/EntityFramework/ServerMode/App.xaml
index 33ec22e..29dd33d 100644
--- a/CS/ViewModel/EntityFramework/ServerMode/App.xaml
+++ b/CS/ViewModel/EntityFramework/ServerMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="EntityFrameworkIssues.App"
+<Application x:Class="EntityFrameworkIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/CS/ViewModel/EntityFramework/ServerMode/EditIssueInfo.cs b/CS/ViewModel/EntityFramework/ServerMode/EditIssueInfo.cs
index 6c86f13..b9daaf6 100644
--- a/CS/ViewModel/EntityFramework/ServerMode/EditIssueInfo.cs
+++ b/CS/ViewModel/EntityFramework/ServerMode/EditIssueInfo.cs
@@ -4,11 +4,11 @@
 
 namespace EntityFrameworkIssues {
     public class EditIssueInfo : BindableBase {
-        public EditIssueInfo(IssuesContext context, IList users) {
-            Context = context;
+        public EditIssueInfo(IssuesContext dbContext, IList users) {
+            DbContext = dbContext;
             Users = users;
         }
-        public IssuesContext Context { get; }
+        public IssuesContext DbContext { get; }
         public IList Users { get; }
     }
 }
\ No newline at end of file
diff --git a/CS/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml b/CS/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml
index 23a72d0..807620e 100644
--- a/CS/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml
+++ b/CS/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/ViewModel/EntityFramework/ServerMode/MainViewModel.cs b/CS/ViewModel/EntityFramework/ServerMode/MainViewModel.cs
index ebe4e98..ac646fc 100644
--- a/CS/ViewModel/EntityFramework/ServerMode/MainViewModel.cs
+++ b/CS/ViewModel/EntityFramework/ServerMode/MainViewModel.cs
@@ -58,11 +58,11 @@ public void CreateEditEntityViewModel(DevExpress.Mvvm.Xpf.CreateEditItemViewMode
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
         public void ValidateRow(DevExpress.Mvvm.Xpf.EditFormRowValidationArgs args) {
-            var context = ((EditIssueInfo)args.Tag).Context;
+            var context = ((EditIssueInfo)args.EditOperationContext).DbContext;
             context.SaveChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs args) {
             var key = (int)args.Keys.Single();
             var item = new Issue() { Id = key };
             var context = new IssuesContext();
diff --git a/CS/ViewModel/EntityFramework/ServerMode/MainWindow.xaml b/CS/ViewModel/EntityFramework/ServerMode/MainWindow.xaml
index 61e5e53..a246a7c 100644
--- a/CS/ViewModel/EntityFramework/ServerMode/MainWindow.xaml
+++ b/CS/ViewModel/EntityFramework/ServerMode/MainWindow.xaml
@@ -6,11 +6,11 @@
       <dxb:BarButtonItem Content="New" Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Add.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="Delete (Del)" Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Delete.svg}" BarItemDisplayMode="ContentAndGlyph" />
     </dxb:ToolBarControl>
-    <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
+    <dxg:GridControl x:Name="grid" ItemsSource="{Binding ServerModeSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/EntityFramework/ServerMode/ServerMode.csproj b/CS/ViewModel/EntityFramework/ServerMode/ServerMode.csproj
index 1172fa9..ed626db 100644
--- a/CS/ViewModel/EntityFramework/ServerMode/ServerMode.csproj
+++ b/CS/ViewModel/EntityFramework/ServerMode/ServerMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -158,8 +158,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/XPO/InfiniteAsyncSource/App.xaml b/CS/ViewModel/XPO/InfiniteAsyncSource/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/ViewModel/XPO/InfiniteAsyncSource/App.xaml
+++ b/CS/ViewModel/XPO/InfiniteAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj b/CS/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj
index 52d99de..52b6257 100644
--- a/CS/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj
+++ b/CS/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -153,8 +153,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.cs b/CS/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.cs
index 4304e0b..c23576f 100644
--- a/CS/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.cs
+++ b/CS/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.cs
@@ -72,7 +72,7 @@ public void ValidateRow(DevExpress.Mvvm.Xpf.RowValidationArgs args) {
             }
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs args) {
             using(var unitOfWork = new DevExpress.Xpo.UnitOfWork()) {
                 var key = DetachedObjectsHelper.GetKey(args.Items.Single());
                 var item = unitOfWork.GetObjectByKey<XPOIssues.Issues.Issue>(key);
diff --git a/CS/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml b/CS/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml
index 329c35a..5cbc52b 100644
--- a/CS/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml
+++ b/CS/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml
@@ -13,7 +13,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:InfiniteAsyncSource CustomProperties="{Binding Properties}" KeyProperty="Oid" FetchRowsCommand="{Binding FetchRowsCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -38,4 +38,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/XPO/InstantFeedbackMode/App.xaml b/CS/ViewModel/XPO/InstantFeedbackMode/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/ViewModel/XPO/InstantFeedbackMode/App.xaml
+++ b/CS/ViewModel/XPO/InstantFeedbackMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj b/CS/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj
index 9edc387..e428710 100644
--- a/CS/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj
+++ b/CS/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -162,8 +162,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml b/CS/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml
index 8110d2f..5b0f4e5 100644
--- a/CS/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml
+++ b/CS/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/ViewModel/XPO/InstantFeedbackMode/MainViewModel.cs b/CS/ViewModel/XPO/InstantFeedbackMode/MainViewModel.cs
index bbba94b..8abe07b 100644
--- a/CS/ViewModel/XPO/InstantFeedbackMode/MainViewModel.cs
+++ b/CS/ViewModel/XPO/InstantFeedbackMode/MainViewModel.cs
@@ -67,11 +67,11 @@ public void CreateEditEntityViewModel(DevExpress.Mvvm.Xpf.CreateEditItemViewMode
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
         public void ValidateRow(DevExpress.Mvvm.Xpf.EditFormRowValidationArgs args) {
-            var unitOfWork = ((EditIssueInfo)args.Tag).UnitOfWork;
+            var unitOfWork = ((EditIssueInfo)args.EditOperationContext).UnitOfWork;
             unitOfWork.CommitChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs args) {
             using(var unitOfWork = new UnitOfWork()) {
                 var key = (int)args.Keys.Single();
                 var item = unitOfWork.GetObjectByKey<Issue>(key);
diff --git a/CS/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml b/CS/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml
index a04cf72..f0b7b2a 100644
--- a/CS/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml
+++ b/CS/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/XPO/LocalData/App.xaml b/CS/ViewModel/XPO/LocalData/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/ViewModel/XPO/LocalData/App.xaml
+++ b/CS/ViewModel/XPO/LocalData/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/ViewModel/XPO/LocalData/LocalData.csproj b/CS/ViewModel/XPO/LocalData/LocalData.csproj
index 738e1e2..45e96b0 100644
--- a/CS/ViewModel/XPO/LocalData/LocalData.csproj
+++ b/CS/ViewModel/XPO/LocalData/LocalData.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -153,8 +153,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/XPO/LocalData/MainViewModel.cs b/CS/ViewModel/XPO/LocalData/MainViewModel.cs
index 5bf9714..9759236 100644
--- a/CS/ViewModel/XPO/LocalData/MainViewModel.cs
+++ b/CS/ViewModel/XPO/LocalData/MainViewModel.cs
@@ -24,7 +24,7 @@ public void ValidateRow(DevExpress.Mvvm.Xpf.RowValidationArgs args) {
             _UnitOfWork.CommitChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs args) {
             var item = (XPOIssues.Issues.User)args.Items.Single();
             _UnitOfWork.Delete(item);
             _UnitOfWork.CommitChanges();
diff --git a/CS/ViewModel/XPO/LocalData/MainWindow.xaml b/CS/ViewModel/XPO/LocalData/MainWindow.xaml
index 4aec421..9f6924b 100644
--- a/CS/ViewModel/XPO/LocalData/MainWindow.xaml
+++ b/CS/ViewModel/XPO/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRowCommand="{Binding ValidateRowCommand}" ValidateRowDeletionCommand="{Binding ValidateRowDeletionCommand}" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -28,4 +28,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/XPO/PagedAsyncSource/App.xaml b/CS/ViewModel/XPO/PagedAsyncSource/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/ViewModel/XPO/PagedAsyncSource/App.xaml
+++ b/CS/ViewModel/XPO/PagedAsyncSource/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml b/CS/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml
index 0096ddb..f599aae 100644
--- a/CS/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml
+++ b/CS/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml
@@ -11,7 +11,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:PagedAsyncSource CustomProperties="{Binding Properties}" KeyProperty="Oid" PageNavigationMode="ArbitraryWithTotalPageCount" FetchPageCommand="{Binding FetchPageCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -33,4 +33,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.csproj b/CS/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.csproj
index 0476beb..908bdc2 100644
--- a/CS/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.csproj
+++ b/CS/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -153,8 +153,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/CS/ViewModel/XPO/ServerMode/App.xaml b/CS/ViewModel/XPO/ServerMode/App.xaml
index 1e81d99..5cc3660 100644
--- a/CS/ViewModel/XPO/ServerMode/App.xaml
+++ b/CS/ViewModel/XPO/ServerMode/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="XPOIssues.App"
+<Application x:Class="XPOIssues.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:XPOIssues"
diff --git a/CS/ViewModel/XPO/ServerMode/IssueDetailView.xaml b/CS/ViewModel/XPO/ServerMode/IssueDetailView.xaml
index 8110d2f..5b0f4e5 100644
--- a/CS/ViewModel/XPO/ServerMode/IssueDetailView.xaml
+++ b/CS/ViewModel/XPO/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/CS/ViewModel/XPO/ServerMode/MainViewModel.cs b/CS/ViewModel/XPO/ServerMode/MainViewModel.cs
index 996c246..eb66edc 100644
--- a/CS/ViewModel/XPO/ServerMode/MainViewModel.cs
+++ b/CS/ViewModel/XPO/ServerMode/MainViewModel.cs
@@ -65,11 +65,11 @@ public void CreateEditEntityViewModel(DevExpress.Mvvm.Xpf.CreateEditItemViewMode
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
         public void ValidateRow(DevExpress.Mvvm.Xpf.EditFormRowValidationArgs args) {
-            var unitOfWork = ((EditIssueInfo)args.Tag).UnitOfWork;
+            var unitOfWork = ((EditIssueInfo)args.EditOperationContext).UnitOfWork;
             unitOfWork.CommitChanges();
         }
         [DevExpress.Mvvm.DataAnnotations.Command]
-        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs args) {
+        public void ValidateRowDeletion(DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs args) {
             using(var unitOfWork = new UnitOfWork()) {
                 var key = (int)args.Keys.Single();
                 var item = unitOfWork.GetObjectByKey<Issue>(key);
diff --git a/CS/ViewModel/XPO/ServerMode/MainWindow.xaml b/CS/ViewModel/XPO/ServerMode/MainWindow.xaml
index a04cf72..25fbe03 100644
--- a/CS/ViewModel/XPO/ServerMode/MainWindow.xaml
+++ b/CS/ViewModel/XPO/ServerMode/MainWindow.xaml
@@ -6,11 +6,11 @@
       <dxb:BarButtonItem Content="New" Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Add.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="Delete (Del)" Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Delete.svg}" BarItemDisplayMode="ContentAndGlyph" />
     </dxb:ToolBarControl>
-    <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
+    <dxg:GridControl x:Name="grid" ItemsSource="{Binding ServerModeSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CS/ViewModel/XPO/ServerMode/ServerMode.csproj b/CS/ViewModel/XPO/ServerMode/ServerMode.csproj
index ef87ab8..d82b5ee 100644
--- a/CS/ViewModel/XPO/ServerMode/ServerMode.csproj
+++ b/CS/ViewModel/XPO/ServerMode/ServerMode.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -162,8 +162,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/README.md b/README.md
index e9c7c14..9238d77 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 <!-- default badges list -->
-![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/265491908/21.2.2%2B)
 [![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/T899930)
 [![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
 <!-- default badges end -->
@@ -16,34 +15,34 @@ See also: [How to: Bind Data Grid control to data](https://github.com/DevExpress
 ||Entity Framework 6 [?](https://docs.microsoft.com/en-us/ef/ef6/)|Entity Framework Core [?](https://docs.microsoft.com/en-us/ef/)|DevExpress XPO [?](https://docs.devexpress.com/XPO/1998/express-persistent-objects)|
 |:---|:---:|:---:|:---:|
 |Local Data [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-local-data)|[project](CS/CodeBehind/EntityFramework/LocalData), [code](CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/LocalData/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/LocalData), [code](CS/CodeBehind/EFCore/LocalData/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/LocalData/MainWindow.xaml)|[project](CS/CodeBehind/XPO/LocalData), [code](CS/CodeBehind/XPO/LocalData/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/LocalData/MainWindow.xaml)|
-|Infinite Async Source [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](CS/CodeBehind/EntityFramework/InfiniteAsyncSource), [code](CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/InfiniteAsyncSource), [code](CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/XPO/InfiniteAsyncSource), [code](CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml)|
-|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](CS/CodeBehind/EntityFramework/PagedAsyncSource), [code](CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/PagedAsyncSource), [code](CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/XPO/PagedAsyncSource), [code](CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml)|
-|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](CS/CodeBehind/EntityFramework/InstantFeedbackMode), [code](CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/InstantFeedbackMode), [code](CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](CS/CodeBehind/XPO/InstantFeedbackMode), [code](CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml)|
-|Server Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](CS/CodeBehind/EntityFramework/ServerMode), [code](CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/ServerMode), [code](CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml)|[project](CS/CodeBehind/XPO/ServerMode), [code](CS/CodeBehind/XPO/ServerMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/ServerMode/MainWindow.xaml)|
+|Infinite Async Source [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](CS/CodeBehind/EntityFramework/InfiniteAsyncSource), [code](CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/InfiniteAsyncSource), [code](CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/XPO/InfiniteAsyncSource), [code](CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml)|
+|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](CS/CodeBehind/EntityFramework/PagedAsyncSource), [code](CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/PagedAsyncSource), [code](CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](CS/CodeBehind/XPO/PagedAsyncSource), [code](CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml)|
+|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](CS/CodeBehind/EntityFramework/InstantFeedbackMode), [code](CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/InstantFeedbackMode), [code](CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](CS/CodeBehind/XPO/InstantFeedbackMode), [code](CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml)|
+|Server Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](CS/CodeBehind/EntityFramework/ServerMode), [code](CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml)|[project](CS/CodeBehind/EFCore/ServerMode), [code](CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/EFCore/ServerMode/MainWindow.xaml)|[project](CS/CodeBehind/XPO/ServerMode), [code](CS/CodeBehind/XPO/ServerMode/MainWindow.xaml.cs), [xaml](CS/CodeBehind/XPO/ServerMode/MainWindow.xaml)|
 ## ViewModel
 ||Entity Framework 6 [?](https://docs.microsoft.com/en-us/ef/ef6/)|Entity Framework Core [?](https://docs.microsoft.com/en-us/ef/)|DevExpress XPO [?](https://docs.devexpress.com/XPO/1998/express-persistent-objects)|
 |:---|:---:|:---:|:---:|
 |Local Data [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-local-data)|[project](CS/ViewModel/EntityFramework/LocalData), [code](CS/ViewModel/EntityFramework/LocalData/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/LocalData/MainWindow.xaml)|[project](CS/ViewModel/EFCore/LocalData), [code](CS/ViewModel/EFCore/LocalData/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/LocalData/MainWindow.xaml)|[project](CS/ViewModel/XPO/LocalData), [code](CS/ViewModel/XPO/LocalData/MainViewModel.cs), [xaml](CS/ViewModel/XPO/LocalData/MainWindow.xaml)|
-|Infinite Async Source [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](CS/ViewModel/EntityFramework/InfiniteAsyncSource), [code](CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/EFCore/InfiniteAsyncSource), [code](CS/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/XPO/InfiniteAsyncSource), [code](CS/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml)|
-|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](CS/ViewModel/EntityFramework/PagedAsyncSource), [code](CS/ViewModel/EntityFramework/PagedAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/EFCore/PagedAsyncSource), [code](CS/ViewModel/EFCore/PagedAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/XPO/PagedAsyncSource), [code](CS/ViewModel/XPO/PagedAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml)|
-|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](CS/ViewModel/EntityFramework/InstantFeedbackMode), [code](CS/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](CS/ViewModel/EFCore/InstantFeedbackMode), [code](CS/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](CS/ViewModel/XPO/InstantFeedbackMode), [code](CS/ViewModel/XPO/InstantFeedbackMode/MainViewModel.cs), [xaml](CS/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml)|
-|Server Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](CS/ViewModel/EntityFramework/ServerMode), [code](CS/ViewModel/EntityFramework/ServerMode/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/ServerMode/MainWindow.xaml)|[project](CS/ViewModel/EFCore/ServerMode), [code](CS/ViewModel/EFCore/ServerMode/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/ServerMode/MainWindow.xaml)|[project](CS/ViewModel/XPO/ServerMode), [code](CS/ViewModel/XPO/ServerMode/MainViewModel.cs), [xaml](CS/ViewModel/XPO/ServerMode/MainWindow.xaml)|
+|Infinite Async Source [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](CS/ViewModel/EntityFramework/InfiniteAsyncSource), [code](CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/EFCore/InfiniteAsyncSource), [code](CS/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/XPO/InfiniteAsyncSource), [code](CS/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml)|
+|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](CS/ViewModel/EntityFramework/PagedAsyncSource), [code](CS/ViewModel/EntityFramework/PagedAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/EFCore/PagedAsyncSource), [code](CS/ViewModel/EFCore/PagedAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](CS/ViewModel/XPO/PagedAsyncSource), [code](CS/ViewModel/XPO/PagedAsyncSource/MainViewModel.cs), [xaml](CS/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml)|
+|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](CS/ViewModel/EntityFramework/InstantFeedbackMode), [code](CS/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](CS/ViewModel/EFCore/InstantFeedbackMode), [code](CS/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](CS/ViewModel/XPO/InstantFeedbackMode), [code](CS/ViewModel/XPO/InstantFeedbackMode/MainViewModel.cs), [xaml](CS/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml)|
+|Server Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](CS/ViewModel/EntityFramework/ServerMode), [code](CS/ViewModel/EntityFramework/ServerMode/MainViewModel.cs), [xaml](CS/ViewModel/EntityFramework/ServerMode/MainWindow.xaml)|[project](CS/ViewModel/EFCore/ServerMode), [code](CS/ViewModel/EFCore/ServerMode/MainViewModel.cs), [xaml](CS/ViewModel/EFCore/ServerMode/MainWindow.xaml)|[project](CS/ViewModel/XPO/ServerMode), [code](CS/ViewModel/XPO/ServerMode/MainViewModel.cs), [xaml](CS/ViewModel/XPO/ServerMode/MainWindow.xaml)|
 # Visual Basic
 ## CodeBehind
 ||Entity Framework 6 [?](https://docs.microsoft.com/en-us/ef/ef6/)|Entity Framework Core [?](https://docs.microsoft.com/en-us/ef/)|DevExpress XPO [?](https://docs.devexpress.com/XPO/1998/express-persistent-objects)|
 |:---|:---:|:---:|:---:|
 |Local Data [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-local-data)|[project](VB/CodeBehind/EntityFramework/LocalData), [code](VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/LocalData), [code](VB/CodeBehind/EFCore/LocalData/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/LocalData/MainWindow.xaml)|[project](VB/CodeBehind/XPO/LocalData), [code](VB/CodeBehind/XPO/LocalData/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/LocalData/MainWindow.xaml)|
-|Infinite Async Source [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](VB/CodeBehind/EntityFramework/InfiniteAsyncSource), [code](VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/InfiniteAsyncSource), [code](VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/XPO/InfiniteAsyncSource), [code](VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml)|
-|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](VB/CodeBehind/EntityFramework/PagedAsyncSource), [code](VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/PagedAsyncSource), [code](VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/XPO/PagedAsyncSource), [code](VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml)|
-|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](VB/CodeBehind/EntityFramework/InstantFeedbackMode), [code](VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/InstantFeedbackMode), [code](VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](VB/CodeBehind/XPO/InstantFeedbackMode), [code](VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml)|
-|Server Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](VB/CodeBehind/EntityFramework/ServerMode), [code](VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/ServerMode), [code](VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml)|[project](VB/CodeBehind/XPO/ServerMode), [code](VB/CodeBehind/XPO/ServerMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/ServerMode/MainWindow.xaml)|
+|Infinite Async Source [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](VB/CodeBehind/EntityFramework/InfiniteAsyncSource), [code](VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/InfiniteAsyncSource), [code](VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/XPO/InfiniteAsyncSource), [code](VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml)|
+|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](VB/CodeBehind/EntityFramework/PagedAsyncSource), [code](VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/PagedAsyncSource), [code](VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](VB/CodeBehind/XPO/PagedAsyncSource), [code](VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml)|
+|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](VB/CodeBehind/EntityFramework/InstantFeedbackMode), [code](VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/InstantFeedbackMode), [code](VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](VB/CodeBehind/XPO/InstantFeedbackMode), [code](VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml)|
+|Server Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](VB/CodeBehind/EntityFramework/ServerMode), [code](VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml)|[project](VB/CodeBehind/EFCore/ServerMode), [code](VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml)|[project](VB/CodeBehind/XPO/ServerMode), [code](VB/CodeBehind/XPO/ServerMode/MainWindow.xaml.vb), [xaml](VB/CodeBehind/XPO/ServerMode/MainWindow.xaml)|
 ## ViewModel
 ||Entity Framework 6 [?](https://docs.microsoft.com/en-us/ef/ef6/)|Entity Framework Core [?](https://docs.microsoft.com/en-us/ef/)|DevExpress XPO [?](https://docs.devexpress.com/XPO/1998/express-persistent-objects)|
 |:---|:---:|:---:|:---:|
 |Local Data [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-local-data)|[project](VB/ViewModel/EntityFramework/LocalData), [code](VB/ViewModel/EntityFramework/LocalData/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/LocalData/MainWindow.xaml)|[project](VB/ViewModel/EFCore/LocalData), [code](VB/ViewModel/EFCore/LocalData/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/LocalData/MainWindow.xaml)|[project](VB/ViewModel/XPO/LocalData), [code](VB/ViewModel/XPO/LocalData/MainViewModel.vb), [xaml](VB/ViewModel/XPO/LocalData/MainWindow.xaml)|
-|Infinite Async Source [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](VB/ViewModel/EntityFramework/InfiniteAsyncSource), [code](VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/EFCore/InfiniteAsyncSource), [code](VB/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/XPO/InfiniteAsyncSource), [code](VB/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml)|
-|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](VB/ViewModel/EntityFramework/PagedAsyncSource), [code](VB/ViewModel/EntityFramework/PagedAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/EFCore/PagedAsyncSource), [code](VB/ViewModel/EFCore/PagedAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/XPO/PagedAsyncSource), [code](VB/ViewModel/XPO/PagedAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml)|
-|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](VB/ViewModel/EntityFramework/InstantFeedbackMode), [code](VB/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](VB/ViewModel/EFCore/InstantFeedbackMode), [code](VB/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](VB/ViewModel/XPO/InstantFeedbackMode), [code](VB/ViewModel/XPO/InstantFeedbackMode/MainViewModel.vb), [xaml](VB/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml)|
-|Server Mode [?](https://docs.devexpress.com/WPF/6090/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](VB/ViewModel/EntityFramework/ServerMode), [code](VB/ViewModel/EntityFramework/ServerMode/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/ServerMode/MainWindow.xaml)|[project](VB/ViewModel/EFCore/ServerMode), [code](VB/ViewModel/EFCore/ServerMode/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/ServerMode/MainWindow.xaml)|[project](VB/ViewModel/XPO/ServerMode), [code](VB/ViewModel/XPO/ServerMode/MainViewModel.vb), [xaml](VB/ViewModel/XPO/ServerMode/MainWindow.xaml)|
+|Infinite Async Source [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#infinite-source)|[project](VB/ViewModel/EntityFramework/InfiniteAsyncSource), [code](VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/EFCore/InfiniteAsyncSource), [code](VB/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/XPO/InfiniteAsyncSource), [code](VB/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml)|
+|Paged Async Source <sup>[1](#f1)</sup> [?](https://docs.devexpress.com/WPF/120193/controls-and-libraries/data-grid/bind-to-data/bind-to-any-data-source-with-virtual-sources/virtual-sources-overview#paged-source)|[project](VB/ViewModel/EntityFramework/PagedAsyncSource), [code](VB/ViewModel/EntityFramework/PagedAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/EFCore/PagedAsyncSource), [code](VB/ViewModel/EFCore/PagedAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml)|[project](VB/ViewModel/XPO/PagedAsyncSource), [code](VB/ViewModel/XPO/PagedAsyncSource/MainViewModel.vb), [xaml](VB/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml)|
+|Instant Feedback Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#instant-feedback-mode)|[project](VB/ViewModel/EntityFramework/InstantFeedbackMode), [code](VB/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml)|[project](VB/ViewModel/EFCore/InstantFeedbackMode), [code](VB/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml)|[project](VB/ViewModel/XPO/InstantFeedbackMode), [code](VB/ViewModel/XPO/InstantFeedbackMode/MainViewModel.vb), [xaml](VB/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml)|
+|Server Mode [?](https://docs.devexpress.com/WPF/6279/controls-and-libraries/data-grid/bind-to-data/server-mode-and-instant-feedback#server-mode)|[project](VB/ViewModel/EntityFramework/ServerMode), [code](VB/ViewModel/EntityFramework/ServerMode/MainViewModel.vb), [xaml](VB/ViewModel/EntityFramework/ServerMode/MainWindow.xaml)|[project](VB/ViewModel/EFCore/ServerMode), [code](VB/ViewModel/EFCore/ServerMode/MainViewModel.vb), [xaml](VB/ViewModel/EFCore/ServerMode/MainWindow.xaml)|[project](VB/ViewModel/XPO/ServerMode), [code](VB/ViewModel/XPO/ServerMode/MainViewModel.vb), [xaml](VB/ViewModel/XPO/ServerMode/MainWindow.xaml)|
 
 <b id="f1"><sup>1</sup></b> Create and delete operations are not available with the Paged Async Source binding.
diff --git a/VB/CodeBehind/EFCore/InfiniteAsyncSource/Application.xaml b/VB/CodeBehind/EFCore/InfiniteAsyncSource/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/CodeBehind/EFCore/InfiniteAsyncSource/Application.xaml
+++ b/VB/CodeBehind/EFCore/InfiniteAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj b/VB/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
index 4f0e566..fe516aa 100644
--- a/VB/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
+++ b/VB/CodeBehind/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -245,4 +245,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml b/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml
index 823eeb7..955d5dd 100644
--- a/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml
+++ b/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,4 +32,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.vb b/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.vb
index a878180..eb5a5a2 100644
--- a/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EFCore/InfiniteAsyncSource/MainWindow.xaml.vb
@@ -49,7 +49,7 @@ Class MainWindow
 
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs)
         Dim row = CType(e.Rows.Single(), Issues.Issue)
         Dim context = New Issues.IssuesContext()
         context.Entry(row).State = EntityState.Deleted
diff --git a/VB/CodeBehind/EFCore/InstantFeedbackMode/Application.xaml b/VB/CodeBehind/EFCore/InstantFeedbackMode/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/CodeBehind/EFCore/InstantFeedbackMode/Application.xaml
+++ b/VB/CodeBehind/EFCore/InstantFeedbackMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.vb b/VB/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.vb
index 5ed81d2..d3cd378 100644
--- a/VB/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.vb
+++ b/VB/CodeBehind/EFCore/InstantFeedbackMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EFCoreIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj b/VB/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj
index 587a84a..0e25852 100644
--- a/VB/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj
+++ b/VB/CodeBehind/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -254,4 +254,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml b/VB/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml
index 058337a..148a97d 100644
--- a/VB/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml
+++ b/VB/CodeBehind/EFCore/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml b/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml
index 33fb7ce..c188435 100644
--- a/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml
+++ b/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.vb b/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.vb
index 69c277e..09dd8b6 100644
--- a/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EFCore/InstantFeedbackMode/MainWindow.xaml.vb
@@ -49,11 +49,11 @@ Class MainWindow
     End Sub
 
     Private Sub OnValidateRow(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(e.Tag, EditIssueInfo).Context
+        Dim context = CType(e.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(e.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/CodeBehind/EFCore/LocalData/Application.xaml b/VB/CodeBehind/EFCore/LocalData/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/CodeBehind/EFCore/LocalData/Application.xaml
+++ b/VB/CodeBehind/EFCore/LocalData/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/CodeBehind/EFCore/LocalData/LocalData.vbproj b/VB/CodeBehind/EFCore/LocalData/LocalData.vbproj
index 834aee6..11beb95 100644
--- a/VB/CodeBehind/EFCore/LocalData/LocalData.vbproj
+++ b/VB/CodeBehind/EFCore/LocalData/LocalData.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -245,4 +245,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml b/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml
index 4addf92..1fec45d 100644
--- a/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml
+++ b/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" DataSourceRefresh="OnDataSourceRefresh" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -25,4 +25,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml.vb b/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml.vb
index ffc89be..164335c 100644
--- a/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EFCore/LocalData/MainWindow.xaml.vb
@@ -17,7 +17,7 @@ Class MainWindow
         _Context.SaveChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs)
         Dim row = CType(e.Rows.Single(), Issues.User)
         _Context.Users.Remove(row)
         _Context.SaveChanges()
diff --git a/VB/CodeBehind/EFCore/PagedAsyncSource/Application.xaml b/VB/CodeBehind/EFCore/PagedAsyncSource/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/CodeBehind/EFCore/PagedAsyncSource/Application.xaml
+++ b/VB/CodeBehind/EFCore/PagedAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml b/VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml
index b3c3113..e4b0b21 100644
--- a/VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml
+++ b/VB/CodeBehind/EFCore/PagedAsyncSource/MainWindow.xaml
@@ -8,7 +8,7 @@
       <dxg:GridControl.View>
         <dxg:TableView ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -27,4 +27,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj b/VB/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj
index a4b973d..7c5b2a2 100644
--- a/VB/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj
+++ b/VB/CodeBehind/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -245,4 +245,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/EFCore/ServerMode/Application.xaml b/VB/CodeBehind/EFCore/ServerMode/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/CodeBehind/EFCore/ServerMode/Application.xaml
+++ b/VB/CodeBehind/EFCore/ServerMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/CodeBehind/EFCore/ServerMode/EditIssueInfo.vb b/VB/CodeBehind/EFCore/ServerMode/EditIssueInfo.vb
index 5ed81d2..d3cd378 100644
--- a/VB/CodeBehind/EFCore/ServerMode/EditIssueInfo.vb
+++ b/VB/CodeBehind/EFCore/ServerMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EFCoreIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml b/VB/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml
index 058337a..148a97d 100644
--- a/VB/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml
+++ b/VB/CodeBehind/EFCore/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml b/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml
index 33fb7ce..c188435 100644
--- a/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml
+++ b/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml.vb b/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml.vb
index 9a4b892..20eef9a 100644
--- a/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EFCore/ServerMode/MainWindow.xaml.vb
@@ -47,11 +47,11 @@ Class MainWindow
     End Sub
 
     Private Sub OnValidateRow(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(e.Tag, EditIssueInfo).Context
+        Dim context = CType(e.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(e.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/CodeBehind/EFCore/ServerMode/ServerMode.vbproj b/VB/CodeBehind/EFCore/ServerMode/ServerMode.vbproj
index 024b1c2..284045d 100644
--- a/VB/CodeBehind/EFCore/ServerMode/ServerMode.vbproj
+++ b/VB/CodeBehind/EFCore/ServerMode/ServerMode.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -254,4 +254,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/Application.xaml b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/Application.xaml
+++ b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
index 3fbba99..c439021 100644
--- a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
+++ b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -185,8 +185,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
index b732ad1..dd1deeb 100644
--- a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
+++ b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,4 +32,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.vb b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.vb
index d512564..df8fa24 100644
--- a/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EntityFramework/InfiniteAsyncSource/MainWindow.xaml.vb
@@ -49,7 +49,7 @@ Class MainWindow
 
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs)
         Dim row = CType(e.Rows.Single(), Issues.Issue)
         Dim context = New Issues.IssuesContext()
         context.Entry(row).State = EntityState.Deleted
diff --git a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/Application.xaml b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/Application.xaml
+++ b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb
index c0e5f5f..801418a 100644
--- a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb
+++ b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EntityFrameworkIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj
index 9c14121..5603a1f 100644
--- a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj
+++ b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -194,8 +194,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
index 7bdbd7a..63d8ed9 100644
--- a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
+++ b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml
index ed56284..6cdce44 100644
--- a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml
+++ b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.vb b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.vb
index 64ccaa6..6bffbba 100644
--- a/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EntityFramework/InstantFeedbackMode/MainWindow.xaml.vb
@@ -49,11 +49,11 @@ Class MainWindow
     End Sub
 
     Private Sub OnValidateRow(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(e.Tag, EditIssueInfo).Context
+        Dim context = CType(e.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(e.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/CodeBehind/EntityFramework/LocalData/Application.xaml b/VB/CodeBehind/EntityFramework/LocalData/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/CodeBehind/EntityFramework/LocalData/Application.xaml
+++ b/VB/CodeBehind/EntityFramework/LocalData/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/CodeBehind/EntityFramework/LocalData/LocalData.vbproj b/VB/CodeBehind/EntityFramework/LocalData/LocalData.vbproj
index 939a86b..925420d 100644
--- a/VB/CodeBehind/EntityFramework/LocalData/LocalData.vbproj
+++ b/VB/CodeBehind/EntityFramework/LocalData/LocalData.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -185,8 +185,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml b/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml
index e84cf10..b478e5c 100644
--- a/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml
+++ b/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" DataSourceRefresh="OnDataSourceRefresh" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -25,4 +25,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.vb b/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.vb
index ffc89be..164335c 100644
--- a/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EntityFramework/LocalData/MainWindow.xaml.vb
@@ -17,7 +17,7 @@ Class MainWindow
         _Context.SaveChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs)
         Dim row = CType(e.Rows.Single(), Issues.User)
         _Context.Users.Remove(row)
         _Context.SaveChanges()
diff --git a/VB/CodeBehind/EntityFramework/PagedAsyncSource/Application.xaml b/VB/CodeBehind/EntityFramework/PagedAsyncSource/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/CodeBehind/EntityFramework/PagedAsyncSource/Application.xaml
+++ b/VB/CodeBehind/EntityFramework/PagedAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml b/VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml
index 58027e0..2417140 100644
--- a/VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml
+++ b/VB/CodeBehind/EntityFramework/PagedAsyncSource/MainWindow.xaml
@@ -8,7 +8,7 @@
       <dxg:GridControl.View>
         <dxg:TableView ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -27,4 +27,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj b/VB/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj
index b453f04..26ecb2c 100644
--- a/VB/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj
+++ b/VB/CodeBehind/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -185,8 +185,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/CodeBehind/EntityFramework/ServerMode/Application.xaml b/VB/CodeBehind/EntityFramework/ServerMode/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/CodeBehind/EntityFramework/ServerMode/Application.xaml
+++ b/VB/CodeBehind/EntityFramework/ServerMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.vb b/VB/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.vb
index c0e5f5f..801418a 100644
--- a/VB/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.vb
+++ b/VB/CodeBehind/EntityFramework/ServerMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EntityFrameworkIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml b/VB/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml
index 7bdbd7a..63d8ed9 100644
--- a/VB/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml
+++ b/VB/CodeBehind/EntityFramework/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml b/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml
index ed56284..6cdce44 100644
--- a/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml
+++ b/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.vb b/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.vb
index a3a7766..5c8076a 100644
--- a/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.vb
+++ b/VB/CodeBehind/EntityFramework/ServerMode/MainWindow.xaml.vb
@@ -47,11 +47,11 @@ Class MainWindow
     End Sub
 
     Private Sub OnValidateRow(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(e.Tag, EditIssueInfo).Context
+        Dim context = CType(e.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(e.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/CodeBehind/EntityFramework/ServerMode/ServerMode.vbproj b/VB/CodeBehind/EntityFramework/ServerMode/ServerMode.vbproj
index 0d6fb87..52e1ff2 100644
--- a/VB/CodeBehind/EntityFramework/ServerMode/ServerMode.vbproj
+++ b/VB/CodeBehind/EntityFramework/ServerMode/ServerMode.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -194,8 +194,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/CodeBehind/XPO/InfiniteAsyncSource/Application.xaml b/VB/CodeBehind/XPO/InfiniteAsyncSource/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/CodeBehind/XPO/InfiniteAsyncSource/Application.xaml
+++ b/VB/CodeBehind/XPO/InfiniteAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj b/VB/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
index f80493e..797680d 100644
--- a/VB/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
+++ b/VB/CodeBehind/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
@@ -174,4 +174,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml b/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml
index f3559e1..a3bde47 100644
--- a/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml
+++ b/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,4 +32,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.vb b/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.vb
index cad49a7..f19e267 100644
--- a/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.vb
+++ b/VB/CodeBehind/XPO/InfiniteAsyncSource/MainWindow.xaml.vb
@@ -56,7 +56,7 @@ Class MainWindow
         End Using
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs)
         Using unitOfWork = New DevExpress.Xpo.UnitOfWork()
             Dim key = _DetachedObjectsHelper.GetKey(e.Rows.[Single]())
             Dim item = unitOfWork.GetObjectByKey(Of Issues.Issue)(key)
diff --git a/VB/CodeBehind/XPO/InstantFeedbackMode/Application.xaml b/VB/CodeBehind/XPO/InstantFeedbackMode/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/CodeBehind/XPO/InstantFeedbackMode/Application.xaml
+++ b/VB/CodeBehind/XPO/InstantFeedbackMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj b/VB/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj
index 459eb21..60810c6 100644
--- a/VB/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj
+++ b/VB/CodeBehind/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj
@@ -183,4 +183,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml b/VB/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml
index e00f8b8..80195c1 100644
--- a/VB/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml
+++ b/VB/CodeBehind/XPO/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml b/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml
index 50596c2..4441809 100644
--- a/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml
+++ b/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.vb b/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.vb
index 82e5962..6114807 100644
--- a/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.vb
+++ b/VB/CodeBehind/XPO/InstantFeedbackMode/MainWindow.xaml.vb
@@ -42,11 +42,11 @@ Class MainWindow
     End Sub
 
     Private Sub OnValidateRow(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim unitOfWork = CType(e.Tag, EditIssueInfo).UnitOfWork
+        Dim unitOfWork = CType(e.EditOperationContext, EditIssueInfo).UnitOfWork
         unitOfWork.CommitChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Using unitOfWork = New UnitOfWork()
             Dim key = CInt(e.Keys.[Single]())
             Dim item = unitOfWork.GetObjectByKey(Of Issue)(key)
diff --git a/VB/CodeBehind/XPO/LocalData/Application.xaml b/VB/CodeBehind/XPO/LocalData/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/CodeBehind/XPO/LocalData/Application.xaml
+++ b/VB/CodeBehind/XPO/LocalData/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/CodeBehind/XPO/LocalData/LocalData.vbproj b/VB/CodeBehind/XPO/LocalData/LocalData.vbproj
index dd34a4e..f209edb 100644
--- a/VB/CodeBehind/XPO/LocalData/LocalData.vbproj
+++ b/VB/CodeBehind/XPO/LocalData/LocalData.vbproj
@@ -174,4 +174,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/XPO/LocalData/MainWindow.xaml b/VB/CodeBehind/XPO/LocalData/MainWindow.xaml
index d69224d..edf9b20 100644
--- a/VB/CodeBehind/XPO/LocalData/MainWindow.xaml
+++ b/VB/CodeBehind/XPO/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ValidateRowDeletion="OnValidateRowDeletion" DataSourceRefresh="OnDataSourceRefresh" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -25,4 +25,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/XPO/LocalData/MainWindow.xaml.vb b/VB/CodeBehind/XPO/LocalData/MainWindow.xaml.vb
index 2c413e9..5ede986 100644
--- a/VB/CodeBehind/XPO/LocalData/MainWindow.xaml.vb
+++ b/VB/CodeBehind/XPO/LocalData/MainWindow.xaml.vb
@@ -17,7 +17,7 @@ Class MainWindow
         _UnitOfWork.CommitChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridDeleteRowsValidationEventArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Xpf.Grid.GridValidateRowDeletionEventArgs)
         Dim row = CType(e.Rows.Single(), Issues.User)
         _UnitOfWork.Delete(row)
         _UnitOfWork.CommitChanges()
diff --git a/VB/CodeBehind/XPO/PagedAsyncSource/Application.xaml b/VB/CodeBehind/XPO/PagedAsyncSource/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/CodeBehind/XPO/PagedAsyncSource/Application.xaml
+++ b/VB/CodeBehind/XPO/PagedAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml b/VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml
index 5c86287..f7e3755 100644
--- a/VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml
+++ b/VB/CodeBehind/XPO/PagedAsyncSource/MainWindow.xaml
@@ -8,7 +8,7 @@
       <dxg:GridControl.View>
         <dxg:TableView ShowUpdateRowButtons="OnCellEditorOpen" ValidateRow="OnValidateRow" ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -27,4 +27,4 @@
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.vbproj b/VB/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.vbproj
index 8740ee0..8b1a02a 100644
--- a/VB/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.vbproj
+++ b/VB/CodeBehind/XPO/PagedAsyncSource/PagedAsyncSource.vbproj
@@ -174,4 +174,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/CodeBehind/XPO/ServerMode/Application.xaml b/VB/CodeBehind/XPO/ServerMode/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/CodeBehind/XPO/ServerMode/Application.xaml
+++ b/VB/CodeBehind/XPO/ServerMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/CodeBehind/XPO/ServerMode/IssueDetailView.xaml b/VB/CodeBehind/XPO/ServerMode/IssueDetailView.xaml
index e00f8b8..80195c1 100644
--- a/VB/CodeBehind/XPO/ServerMode/IssueDetailView.xaml
+++ b/VB/CodeBehind/XPO/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml b/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml
index 50596c2..4441809 100644
--- a/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml
+++ b/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefresh="OnDataSourceRefresh" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,10 +32,15 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
       <RowDefinition />
     </Grid.RowDefinitions>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml.vb b/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml.vb
index 0662856..04f7fdd 100644
--- a/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml.vb
+++ b/VB/CodeBehind/XPO/ServerMode/MainWindow.xaml.vb
@@ -43,11 +43,11 @@ Class MainWindow
     End Sub
 
     Private Sub OnValidateRow(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim unitOfWork = CType(e.Tag, EditIssueInfo).UnitOfWork
+        Dim unitOfWork = CType(e.EditOperationContext, EditIssueInfo).UnitOfWork
         unitOfWork.CommitChanges()
     End Sub
 
-    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Private Sub OnValidateRowDeletion(ByVal sender As System.Object, ByVal e As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Using unitOfWork = New UnitOfWork()
             Dim key = CInt(e.Keys.[Single]())
             Dim item = unitOfWork.GetObjectByKey(Of Issue)(key)
diff --git a/VB/CodeBehind/XPO/ServerMode/ServerMode.vbproj b/VB/CodeBehind/XPO/ServerMode/ServerMode.vbproj
index 809b2ca..a9a1497 100644
--- a/VB/CodeBehind/XPO/ServerMode/ServerMode.vbproj
+++ b/VB/CodeBehind/XPO/ServerMode/ServerMode.vbproj
@@ -183,4 +183,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/NuGet.Config b/VB/NuGet.Config
new file mode 100644
index 0000000..f6e98fc
--- /dev/null
+++ b/VB/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <config>
+    <add key="repositorypath" value="packages" />
+  </config>
+</configuration>
\ No newline at end of file
diff --git a/VB/ViewModel/EFCore/InfiniteAsyncSource/Application.xaml b/VB/ViewModel/EFCore/InfiniteAsyncSource/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/ViewModel/EFCore/InfiniteAsyncSource/Application.xaml
+++ b/VB/ViewModel/EFCore/InfiniteAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj b/VB/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
index 5075217..3abf3d3 100644
--- a/VB/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
+++ b/VB/ViewModel/EFCore/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -246,4 +246,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.vb b/VB/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.vb
index 38b187a..0eaa62e 100644
--- a/VB/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.vb
+++ b/VB/ViewModel/EFCore/InfiniteAsyncSource/MainViewModel.vb
@@ -39,7 +39,7 @@ Public Class MainViewModel
         End Try
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs)
         Dim item = CType(args.Items.Single(), Issues.Issue)
         Dim context = New Issues.IssuesContext()
         context.Entry(item).State = EntityState.Deleted
diff --git a/VB/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml b/VB/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml
index fcbbe8d..67b908c 100644
--- a/VB/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml
+++ b/VB/ViewModel/EFCore/InfiniteAsyncSource/MainWindow.xaml
@@ -13,7 +13,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:InfiniteAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" FetchRowsCommand="{Binding FetchRowsCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -38,4 +38,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EFCore/InstantFeedbackMode/Application.xaml b/VB/ViewModel/EFCore/InstantFeedbackMode/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/ViewModel/EFCore/InstantFeedbackMode/Application.xaml
+++ b/VB/ViewModel/EFCore/InstantFeedbackMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.vb b/VB/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.vb
index 5ed81d2..d3cd378 100644
--- a/VB/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.vb
+++ b/VB/ViewModel/EFCore/InstantFeedbackMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EFCoreIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj b/VB/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj
index 23d63aa..fd9f4d4 100644
--- a/VB/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj
+++ b/VB/ViewModel/EFCore/InstantFeedbackMode/InstantFeedbackMode.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -255,4 +255,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml b/VB/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml
index 058337a..148a97d 100644
--- a/VB/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml
+++ b/VB/ViewModel/EFCore/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.vb b/VB/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.vb
index 2a69c31..d48b118 100644
--- a/VB/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.vb
+++ b/VB/ViewModel/EFCore/InstantFeedbackMode/MainViewModel.vb
@@ -62,11 +62,11 @@ Public Class MainViewModel
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
     Public Sub ValidateRow(ByVal args As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(args.Tag, EditIssueInfo).Context
+        Dim context = CType(args.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(args.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml b/VB/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml
index 1eb2f58..8070f77 100644
--- a/VB/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml
+++ b/VB/ViewModel/EFCore/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EFCore/LocalData/Application.xaml b/VB/ViewModel/EFCore/LocalData/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/ViewModel/EFCore/LocalData/Application.xaml
+++ b/VB/ViewModel/EFCore/LocalData/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/ViewModel/EFCore/LocalData/LocalData.vbproj b/VB/ViewModel/EFCore/LocalData/LocalData.vbproj
index e146ebb..8a23709 100644
--- a/VB/ViewModel/EFCore/LocalData/LocalData.vbproj
+++ b/VB/ViewModel/EFCore/LocalData/LocalData.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -246,4 +246,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/EFCore/LocalData/MainViewModel.vb b/VB/ViewModel/EFCore/LocalData/MainViewModel.vb
index 98f0a5e..e300722 100644
--- a/VB/ViewModel/EFCore/LocalData/MainViewModel.vb
+++ b/VB/ViewModel/EFCore/LocalData/MainViewModel.vb
@@ -22,7 +22,7 @@ Public Class MainViewModel
         _Context.SaveChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs)
         Dim item = CType(args.Items.Single(), Issues.User)
         _Context.Users.Remove(item)
         _Context.SaveChanges()
diff --git a/VB/ViewModel/EFCore/LocalData/MainWindow.xaml b/VB/ViewModel/EFCore/LocalData/MainWindow.xaml
index 0b69bc4..031e98c 100644
--- a/VB/ViewModel/EFCore/LocalData/MainWindow.xaml
+++ b/VB/ViewModel/EFCore/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRowCommand="{Binding ValidateRowCommand}" ValidateRowDeletionCommand="{Binding ValidateRowDeletionCommand}" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -28,4 +28,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EFCore/PagedAsyncSource/Application.xaml b/VB/ViewModel/EFCore/PagedAsyncSource/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/ViewModel/EFCore/PagedAsyncSource/Application.xaml
+++ b/VB/ViewModel/EFCore/PagedAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml b/VB/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml
index a3aa5c7..047906c 100644
--- a/VB/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml
+++ b/VB/ViewModel/EFCore/PagedAsyncSource/MainWindow.xaml
@@ -11,7 +11,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:PagedAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" PageNavigationMode="ArbitraryWithTotalPageCount" FetchPageCommand="{Binding FetchPageCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -33,4 +33,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj b/VB/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj
index 32b6a57..2980442 100644
--- a/VB/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj
+++ b/VB/ViewModel/EFCore/PagedAsyncSource/PagedAsyncSource.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -246,4 +246,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/EFCore/ServerMode/Application.xaml b/VB/ViewModel/EFCore/ServerMode/Application.xaml
index 1d7676b..a61def8 100644
--- a/VB/ViewModel/EFCore/ServerMode/Application.xaml
+++ b/VB/ViewModel/EFCore/ServerMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EFCoreIssues"
diff --git a/VB/ViewModel/EFCore/ServerMode/EditIssueInfo.vb b/VB/ViewModel/EFCore/ServerMode/EditIssueInfo.vb
index 5ed81d2..d3cd378 100644
--- a/VB/ViewModel/EFCore/ServerMode/EditIssueInfo.vb
+++ b/VB/ViewModel/EFCore/ServerMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EFCoreIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/ViewModel/EFCore/ServerMode/IssueDetailView.xaml b/VB/ViewModel/EFCore/ServerMode/IssueDetailView.xaml
index 058337a..148a97d 100644
--- a/VB/ViewModel/EFCore/ServerMode/IssueDetailView.xaml
+++ b/VB/ViewModel/EFCore/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/ViewModel/EFCore/ServerMode/MainViewModel.vb b/VB/ViewModel/EFCore/ServerMode/MainViewModel.vb
index 195d4cb..ac3bb24 100644
--- a/VB/ViewModel/EFCore/ServerMode/MainViewModel.vb
+++ b/VB/ViewModel/EFCore/ServerMode/MainViewModel.vb
@@ -60,11 +60,11 @@ Public Class MainViewModel
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
     Public Sub ValidateRow(ByVal args As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(args.Tag, EditIssueInfo).Context
+        Dim context = CType(args.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(args.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/ViewModel/EFCore/ServerMode/MainWindow.xaml b/VB/ViewModel/EFCore/ServerMode/MainWindow.xaml
index 1eb2f58..ead46ba 100644
--- a/VB/ViewModel/EFCore/ServerMode/MainWindow.xaml
+++ b/VB/ViewModel/EFCore/ServerMode/MainWindow.xaml
@@ -6,11 +6,11 @@
       <dxb:BarButtonItem Content="New" Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Add.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="Delete (Del)" Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Delete.svg}" BarItemDisplayMode="ContentAndGlyph" />
     </dxb:ToolBarControl>
-    <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
+    <dxg:GridControl x:Name="grid" ItemsSource="{Binding ServerModeSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EFCore/ServerMode/ServerMode.vbproj b/VB/ViewModel/EFCore/ServerMode/ServerMode.vbproj
index 9de962b..51ef3b2 100644
--- a/VB/ViewModel/EFCore/ServerMode/ServerMode.vbproj
+++ b/VB/ViewModel/EFCore/ServerMode/ServerMode.vbproj
@@ -51,79 +51,79 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.InMemory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.EntityFrameworkCore.InMemory.3.1.18\lib\netstandard2.0\Microsoft.EntityFrameworkCore.InMemory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Caching.Memory, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.18\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Options, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Options.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.18.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Primitives.3.1.18\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>..\..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -255,4 +255,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/Application.xaml b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/Application.xaml
+++ b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
index 42dd353..1d9f85e 100644
--- a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
+++ b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -186,8 +186,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.vb b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.vb
index 1f12f02..6dc9e56 100644
--- a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.vb
+++ b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainViewModel.vb
@@ -39,7 +39,7 @@ Public Class MainViewModel
         End Try
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs)
         Dim item = CType(args.Items.Single(), Issues.Issue)
         Dim context = New Issues.IssuesContext()
         context.Entry(item).State = EntityState.Deleted
diff --git a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
index be01420..c63a6da 100644
--- a/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
+++ b/VB/ViewModel/EntityFramework/InfiniteAsyncSource/MainWindow.xaml
@@ -13,7 +13,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:InfiniteAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" FetchRowsCommand="{Binding FetchRowsCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -38,4 +38,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EntityFramework/InstantFeedbackMode/Application.xaml b/VB/ViewModel/EntityFramework/InstantFeedbackMode/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/ViewModel/EntityFramework/InstantFeedbackMode/Application.xaml
+++ b/VB/ViewModel/EntityFramework/InstantFeedbackMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb b/VB/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb
index c0e5f5f..801418a 100644
--- a/VB/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb
+++ b/VB/ViewModel/EntityFramework/InstantFeedbackMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EntityFrameworkIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj b/VB/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj
index ec273ce..b080c07 100644
--- a/VB/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj
+++ b/VB/ViewModel/EntityFramework/InstantFeedbackMode/InstantFeedbackMode.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -195,8 +195,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml b/VB/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
index 7bdbd7a..63d8ed9 100644
--- a/VB/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
+++ b/VB/ViewModel/EntityFramework/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.vb b/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.vb
index b19c6b6..563bc9d 100644
--- a/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.vb
+++ b/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainViewModel.vb
@@ -62,11 +62,11 @@ Public Class MainViewModel
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
     Public Sub ValidateRow(ByVal args As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(args.Tag, EditIssueInfo).Context
+        Dim context = CType(args.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(args.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml b/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml
index 65c78bd..3d386df 100644
--- a/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml
+++ b/VB/ViewModel/EntityFramework/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EntityFramework/LocalData/Application.xaml b/VB/ViewModel/EntityFramework/LocalData/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/ViewModel/EntityFramework/LocalData/Application.xaml
+++ b/VB/ViewModel/EntityFramework/LocalData/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/ViewModel/EntityFramework/LocalData/LocalData.vbproj b/VB/ViewModel/EntityFramework/LocalData/LocalData.vbproj
index 34e9c8b..ae42fa3 100644
--- a/VB/ViewModel/EntityFramework/LocalData/LocalData.vbproj
+++ b/VB/ViewModel/EntityFramework/LocalData/LocalData.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -186,8 +186,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/ViewModel/EntityFramework/LocalData/MainViewModel.vb b/VB/ViewModel/EntityFramework/LocalData/MainViewModel.vb
index 8d55840..6473b36 100644
--- a/VB/ViewModel/EntityFramework/LocalData/MainViewModel.vb
+++ b/VB/ViewModel/EntityFramework/LocalData/MainViewModel.vb
@@ -22,7 +22,7 @@ Public Class MainViewModel
         _Context.SaveChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs)
         Dim item = CType(args.Items.Single(), Issues.User)
         _Context.Users.Remove(item)
         _Context.SaveChanges()
diff --git a/VB/ViewModel/EntityFramework/LocalData/MainWindow.xaml b/VB/ViewModel/EntityFramework/LocalData/MainWindow.xaml
index dbb5686..c26c4d5 100644
--- a/VB/ViewModel/EntityFramework/LocalData/MainWindow.xaml
+++ b/VB/ViewModel/EntityFramework/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRowCommand="{Binding ValidateRowCommand}" ValidateRowDeletionCommand="{Binding ValidateRowDeletionCommand}" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -28,4 +28,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EntityFramework/PagedAsyncSource/Application.xaml b/VB/ViewModel/EntityFramework/PagedAsyncSource/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/ViewModel/EntityFramework/PagedAsyncSource/Application.xaml
+++ b/VB/ViewModel/EntityFramework/PagedAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml b/VB/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml
index ec18906..a328a3e 100644
--- a/VB/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml
+++ b/VB/ViewModel/EntityFramework/PagedAsyncSource/MainWindow.xaml
@@ -11,7 +11,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:PagedAsyncSource ElementType="local_issues:Issue" KeyProperty="Id" PageNavigationMode="ArbitraryWithTotalPageCount" FetchPageCommand="{Binding FetchPageCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -33,4 +33,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj b/VB/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj
index c4785b7..a1c1a31 100644
--- a/VB/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj
+++ b/VB/ViewModel/EntityFramework/PagedAsyncSource/PagedAsyncSource.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -186,8 +186,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/ViewModel/EntityFramework/ServerMode/Application.xaml b/VB/ViewModel/EntityFramework/ServerMode/Application.xaml
index f3c3806..86ff462 100644
--- a/VB/ViewModel/EntityFramework/ServerMode/Application.xaml
+++ b/VB/ViewModel/EntityFramework/ServerMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:EntityFrameworkIssues"
diff --git a/VB/ViewModel/EntityFramework/ServerMode/EditIssueInfo.vb b/VB/ViewModel/EntityFramework/ServerMode/EditIssueInfo.vb
index c0e5f5f..801418a 100644
--- a/VB/ViewModel/EntityFramework/ServerMode/EditIssueInfo.vb
+++ b/VB/ViewModel/EntityFramework/ServerMode/EditIssueInfo.vb
@@ -5,11 +5,11 @@ Imports EntityFrameworkIssues.Issues
 Public Class EditIssueInfo
     Inherits BindableBase
 
-    Public Sub New(ByVal context As IssuesContext, ByVal users As IList)
-        Me.Context = context
+    Public Sub New(ByVal dbContext As IssuesContext, ByVal users As IList)
+        Me.DbContext = dbContext
         Me.Users = users
     End Sub
 
-    Public ReadOnly Property Context As IssuesContext
+    Public ReadOnly Property DbContext As IssuesContext
     Public ReadOnly Property Users As IList
 End Class
diff --git a/VB/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml b/VB/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml
index 7bdbd7a..63d8ed9 100644
--- a/VB/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml
+++ b/VB/ViewModel/EntityFramework/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/ViewModel/EntityFramework/ServerMode/MainViewModel.vb b/VB/ViewModel/EntityFramework/ServerMode/MainViewModel.vb
index 2a8a03d..3fabfb0 100644
--- a/VB/ViewModel/EntityFramework/ServerMode/MainViewModel.vb
+++ b/VB/ViewModel/EntityFramework/ServerMode/MainViewModel.vb
@@ -60,11 +60,11 @@ Public Class MainViewModel
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
     Public Sub ValidateRow(ByVal args As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim context = CType(args.Tag, EditIssueInfo).Context
+        Dim context = CType(args.EditOperationContext, EditIssueInfo).DbContext
         context.SaveChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Dim key = CInt(args.Keys.[Single]())
         Dim item = New Issue() With {
             .Id = key
diff --git a/VB/ViewModel/EntityFramework/ServerMode/MainWindow.xaml b/VB/ViewModel/EntityFramework/ServerMode/MainWindow.xaml
index 65c78bd..e5c8e51 100644
--- a/VB/ViewModel/EntityFramework/ServerMode/MainWindow.xaml
+++ b/VB/ViewModel/EntityFramework/ServerMode/MainWindow.xaml
@@ -6,11 +6,11 @@
       <dxb:BarButtonItem Content="New" Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Add.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="Delete (Del)" Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Delete.svg}" BarItemDisplayMode="ContentAndGlyph" />
     </dxb:ToolBarControl>
-    <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
+    <dxg:GridControl x:Name="grid" ItemsSource="{Binding ServerModeSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Id" IsSmart="True" />
+      <dxg:GridColumn FieldName="Id" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/EntityFramework/ServerMode/ServerMode.vbproj b/VB/ViewModel/EntityFramework/ServerMode/ServerMode.vbproj
index ad1d7ec..cb22281 100644
--- a/VB/ViewModel/EntityFramework/ServerMode/ServerMode.vbproj
+++ b/VB/ViewModel/EntityFramework/ServerMode/ServerMode.vbproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,10 +54,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -195,8 +195,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-</Project>
\ No newline at end of file
+  <Import Project="..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+</Project>
diff --git a/VB/ViewModel/XPO/InfiniteAsyncSource/Application.xaml b/VB/ViewModel/XPO/InfiniteAsyncSource/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/ViewModel/XPO/InfiniteAsyncSource/Application.xaml
+++ b/VB/ViewModel/XPO/InfiniteAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj b/VB/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
index a8fd3ab..b9e67eb 100644
--- a/VB/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
+++ b/VB/ViewModel/XPO/InfiniteAsyncSource/InfiniteAsyncSource.vbproj
@@ -175,4 +175,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.vb b/VB/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.vb
index aa7ddae..e95b9d2 100644
--- a/VB/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.vb
+++ b/VB/ViewModel/XPO/InfiniteAsyncSource/MainViewModel.vb
@@ -62,7 +62,7 @@ Public Class MainViewModel
         End Using
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs)
         Using unitOfWork = New DevExpress.Xpo.UnitOfWork()
             Dim key = DetachedObjectsHelper.GetKey(args.Items.[Single]())
             Dim item = unitOfWork.GetObjectByKey(Of Issues.Issue)(key)
diff --git a/VB/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml b/VB/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml
index 049894b..595242d 100644
--- a/VB/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml
+++ b/VB/ViewModel/XPO/InfiniteAsyncSource/MainWindow.xaml
@@ -13,7 +13,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:InfiniteAsyncSource CustomProperties="{Binding Properties}" KeyProperty="Oid" FetchRowsCommand="{Binding FetchRowsCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -38,4 +38,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/XPO/InstantFeedbackMode/Application.xaml b/VB/ViewModel/XPO/InstantFeedbackMode/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/ViewModel/XPO/InstantFeedbackMode/Application.xaml
+++ b/VB/ViewModel/XPO/InstantFeedbackMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj b/VB/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj
index 101c737..955b511 100644
--- a/VB/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj
+++ b/VB/ViewModel/XPO/InstantFeedbackMode/InstantFeedbackMode.vbproj
@@ -184,4 +184,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml b/VB/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml
index e00f8b8..80195c1 100644
--- a/VB/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml
+++ b/VB/ViewModel/XPO/InstantFeedbackMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/ViewModel/XPO/InstantFeedbackMode/MainViewModel.vb b/VB/ViewModel/XPO/InstantFeedbackMode/MainViewModel.vb
index 61aa630..4a75201 100644
--- a/VB/ViewModel/XPO/InstantFeedbackMode/MainViewModel.vb
+++ b/VB/ViewModel/XPO/InstantFeedbackMode/MainViewModel.vb
@@ -55,11 +55,11 @@ Public Class MainViewModel
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
     Public Sub ValidateRow(ByVal args As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim unitOfWork = CType(args.Tag, EditIssueInfo).UnitOfWork
+        Dim unitOfWork = CType(args.EditOperationContext, EditIssueInfo).UnitOfWork
         unitOfWork.CommitChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Using unitOfWork = New UnitOfWork()
             Dim key = CInt(args.Keys.[Single]())
             Dim item = unitOfWork.GetObjectByKey(Of Issue)(key)
diff --git a/VB/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml b/VB/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml
index 9305d30..a8bb846 100644
--- a/VB/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml
+++ b/VB/ViewModel/XPO/InstantFeedbackMode/MainWindow.xaml
@@ -8,9 +8,9 @@
     </dxb:ToolBarControl>
     <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/XPO/LocalData/Application.xaml b/VB/ViewModel/XPO/LocalData/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/ViewModel/XPO/LocalData/Application.xaml
+++ b/VB/ViewModel/XPO/LocalData/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/ViewModel/XPO/LocalData/LocalData.vbproj b/VB/ViewModel/XPO/LocalData/LocalData.vbproj
index ba5ef9a..1fdcdce 100644
--- a/VB/ViewModel/XPO/LocalData/LocalData.vbproj
+++ b/VB/ViewModel/XPO/LocalData/LocalData.vbproj
@@ -175,4 +175,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/XPO/LocalData/MainViewModel.vb b/VB/ViewModel/XPO/LocalData/MainViewModel.vb
index fd4baca..4d1f224 100644
--- a/VB/ViewModel/XPO/LocalData/MainViewModel.vb
+++ b/VB/ViewModel/XPO/LocalData/MainViewModel.vb
@@ -22,7 +22,7 @@ Public Class MainViewModel
         _UnitOfWork.CommitChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.DeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.ValidateRowDeletionArgs)
         Dim item = CType(args.Items.Single(), Issues.User)
         _UnitOfWork.Delete(item)
         _UnitOfWork.CommitChanges()
diff --git a/VB/ViewModel/XPO/LocalData/MainWindow.xaml b/VB/ViewModel/XPO/LocalData/MainWindow.xaml
index 5a333f8..19f10c5 100644
--- a/VB/ViewModel/XPO/LocalData/MainWindow.xaml
+++ b/VB/ViewModel/XPO/LocalData/MainWindow.xaml
@@ -10,7 +10,7 @@
       <dxg:GridControl.View>
         <dxg:TableView NewItemRowPosition="Top" ShowUpdateRowButtons="OnCellEditorOpen" ValidateRowCommand="{Binding ValidateRowCommand}" ValidateRowDeletionCommand="{Binding ValidateRowDeletionCommand}" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" ShowFixedTotalSummary="True" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="FirstName" IsSmart="True" />
       <dxg:GridColumn FieldName="LastName" IsSmart="True" />
       <dxg:GridControl.InputBindings>
@@ -28,4 +28,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/XPO/PagedAsyncSource/Application.xaml b/VB/ViewModel/XPO/PagedAsyncSource/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/ViewModel/XPO/PagedAsyncSource/Application.xaml
+++ b/VB/ViewModel/XPO/PagedAsyncSource/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml b/VB/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml
index 3fe3a3c..1bac593 100644
--- a/VB/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml
+++ b/VB/ViewModel/XPO/PagedAsyncSource/MainWindow.xaml
@@ -11,7 +11,7 @@
       <dxg:GridControl.ItemsSource>
         <dx:PagedAsyncSource CustomProperties="{Binding Properties}" KeyProperty="Oid" PageNavigationMode="ArbitraryWithTotalPageCount" FetchPageCommand="{Binding FetchPageCommand}" GetTotalSummariesCommand="{Binding GetTotalSummariesCommand}" />
       </dxg:GridControl.ItemsSource>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" AllowEditing="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" AllowEditing="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" AllowEditing="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -33,4 +33,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.vbproj b/VB/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.vbproj
index 13af006..3c2076b 100644
--- a/VB/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.vbproj
+++ b/VB/ViewModel/XPO/PagedAsyncSource/PagedAsyncSource.vbproj
@@ -175,4 +175,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VB/ViewModel/XPO/ServerMode/Application.xaml b/VB/ViewModel/XPO/ServerMode/Application.xaml
index e2796fa..8b62d12 100644
--- a/VB/ViewModel/XPO/ServerMode/Application.xaml
+++ b/VB/ViewModel/XPO/ServerMode/Application.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:XPOIssues"
diff --git a/VB/ViewModel/XPO/ServerMode/IssueDetailView.xaml b/VB/ViewModel/XPO/ServerMode/IssueDetailView.xaml
index e00f8b8..80195c1 100644
--- a/VB/ViewModel/XPO/ServerMode/IssueDetailView.xaml
+++ b/VB/ViewModel/XPO/ServerMode/IssueDetailView.xaml
@@ -12,11 +12,11 @@ xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
 <dxlc:LayoutControl x:Name="layoutControl" Orientation="Vertical" VerticalAlignment="Top" Width="300">
     <dxlc:DataLayoutItem Binding="{Binding Item.Subject}"/>
     <dxlc:LayoutItem Label="User">
-        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding Tag.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
+        <dxe:ComboBoxEdit EditValue="{Binding Item.UserId}" ItemsSource="{Binding EditOperationContext.Users}" ValueMember="Id" DisplayMember="Name" IsTextEditable="False"/>
     </dxlc:LayoutItem>
     <dxlc:DataLayoutItem Binding="{Binding Item.Created}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Votes}"/>
     <dxlc:DataLayoutItem Binding="{Binding Item.Priority}"/>
 </dxlc:LayoutControl>
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/VB/ViewModel/XPO/ServerMode/MainViewModel.vb b/VB/ViewModel/XPO/ServerMode/MainViewModel.vb
index 68f33b9..e5f06a7 100644
--- a/VB/ViewModel/XPO/ServerMode/MainViewModel.vb
+++ b/VB/ViewModel/XPO/ServerMode/MainViewModel.vb
@@ -57,11 +57,11 @@ Public Class MainViewModel
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
     Public Sub ValidateRow(ByVal args As DevExpress.Mvvm.Xpf.EditFormRowValidationArgs)
-        Dim unitOfWork = CType(args.Tag, EditIssueInfo).UnitOfWork
+        Dim unitOfWork = CType(args.EditOperationContext, EditIssueInfo).UnitOfWork
         unitOfWork.CommitChanges()
     End Sub
     <DevExpress.Mvvm.DataAnnotations.Command>
-    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormDeleteRowsValidationArgs)
+    Public Sub ValidateRowDeletion(ByVal args As DevExpress.Mvvm.Xpf.EditFormValidateRowDeletionArgs)
         Using unitOfWork = New UnitOfWork()
             Dim key = CInt(args.Keys.[Single]())
             Dim item = unitOfWork.GetObjectByKey(Of Issue)(key)
diff --git a/VB/ViewModel/XPO/ServerMode/MainWindow.xaml b/VB/ViewModel/XPO/ServerMode/MainWindow.xaml
index 9305d30..43ce933 100644
--- a/VB/ViewModel/XPO/ServerMode/MainWindow.xaml
+++ b/VB/ViewModel/XPO/ServerMode/MainWindow.xaml
@@ -6,11 +6,11 @@
       <dxb:BarButtonItem Content="New" Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Add.svg}" BarItemDisplayMode="ContentAndGlyph" />
       <dxb:BarButtonItem Content="Delete (Del)" Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Glyph="{dx:DXImage SvgImages/Icon Builder/Actions_Delete.svg}" BarItemDisplayMode="ContentAndGlyph" />
     </dxb:ToolBarControl>
-    <dxg:GridControl x:Name="grid" ItemsSource="{Binding InstantFeedbackSource}" Grid.Row="1">
+    <dxg:GridControl x:Name="grid" ItemsSource="{Binding ServerModeSource}" Grid.Row="1">
       <dxg:GridControl.View>
-        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" />
+        <dxg:TableView ShowFixedTotalSummary="True" DataSourceRefreshCommand="{Binding DataSourceRefreshCommand}" RowDoubleClickCommand="{Binding RowDoubleClickCommand, ElementName=EditFormBehavior}" NavigationStyle="Row" />
       </dxg:GridControl.View>
-      <dxg:GridColumn FieldName="Oid" IsSmart="True" />
+      <dxg:GridColumn FieldName="Oid" IsSmart="True" ReadOnly="True" />
       <dxg:GridColumn FieldName="Subject" IsSmart="True" />
       <dxg:GridColumn FieldName="UserId" IsSmart="True" Header="User">
         <dxg:GridColumn.EditSettings>
@@ -32,6 +32,11 @@
           </dxg:DialogEditFormBehavior.EditTemplate>
         </dxg:DialogEditFormBehavior>
       </dxmvvm:Interaction.Behaviors>
+      <dxg:GridControl.InputBindings>
+        <KeyBinding Command="{Binding DeleteCommand, ElementName=EditFormBehavior}" Key="Delete" />
+        <KeyBinding Command="{Binding UpdateCommand, ElementName=EditFormBehavior}" Key="F2" />
+        <KeyBinding Command="{Binding CreateCommand, ElementName=EditFormBehavior}" Key="N" Modifiers="Control" />
+      </dxg:GridControl.InputBindings>
     </dxg:GridControl>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -41,4 +46,4 @@
   <Window.DataContext>
     <local:MainViewModel />
   </Window.DataContext>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/VB/ViewModel/XPO/ServerMode/ServerMode.vbproj b/VB/ViewModel/XPO/ServerMode/ServerMode.vbproj
index b9d0347..3d852e5 100644
--- a/VB/ViewModel/XPO/ServerMode/ServerMode.vbproj
+++ b/VB/ViewModel/XPO/ServerMode/ServerMode.vbproj
@@ -184,4 +184,4 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
+</Project>