diff --git a/Data/DataAccessContext.Map.cs b/Data/DataAccessContext.Map.cs
new file mode 100644
index 0000000..eb04d81
--- /dev/null
+++ b/Data/DataAccessContext.Map.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.EntityFrameworkCore;
+using ProjectGrid.Models;
+
+
+namespace ProjectGrid.Data
+{
+  public partial class DataAccessContext : DbContext
+  {
+  }
+}
diff --git a/Data/DataAccessContext.User.cs b/Data/DataAccessContext.User.cs
new file mode 100644
index 0000000..2effe45
--- /dev/null
+++ b/Data/DataAccessContext.User.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using Microsoft.EntityFrameworkCore;
+using ProjectGrid.Models;
+
+
+namespace ProjectGrid.Data
+{
+  public partial class DataAccessContext : DbContext, IUserRepository
+  {
+    public DbSet<UserData> Users { get; set; }
+
+    public IEnumerable<UserModel> GetAll()
+    {
+      return Users.Select<UserData, UserModel>(data => data.ToModel());
+    }
+    public UserModel Add(UserModel user)
+    {
+      // TODO: check if exist
+      Users.Add(new UserData(user));
+      SaveChanges();
+      return user;
+    }
+  }
+
+}
diff --git a/Data/DataAccessContext.cs b/Data/DataAccessContext.cs
index c8d175b..b3c86b2 100644
--- a/Data/DataAccessContext.cs
+++ b/Data/DataAccessContext.cs
@@ -7,28 +7,14 @@ using ProjectGrid.Models;
 
 namespace ProjectGrid.Data
 {
-  public class DataAccessContext : DbContext, IUserRepository
+  public partial class DataAccessContext : DbContext, IUserRepository
   {
     public DataAccessContext(DbContextOptions<DataAccessContext> options) : base(options) { }
 
-    public DbSet<UserData> Users { get; set; }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
       modelBuilder.Entity<UserData>().ToTable("USER");
     }
-
-    public IEnumerable<UserModel> GetAll()
-    {
-      return Users.Select<UserData, UserModel>(data => data.ToModel());
-    }
-
-    public UserModel Add(UserModel user)
-    {
-      // TODO: check if exist
-      Users.Add(new UserData(user));
-      SaveChanges();
-      return user;
-    }
   }
 }
diff --git a/Data/MapData.cs b/Data/MapData.cs
index dbbabe0..e49cc51 100644
--- a/Data/MapData.cs
+++ b/Data/MapData.cs
@@ -1,16 +1,19 @@
-using ProjectGrid.Models;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 
 
 namespace ProjectGrid.Data
 {
+  [Table("Map", Schema = "Map")]
   public class MapData
   {
-    public int? Id { get; set; }
+    [Key]
+    public int Id { get; set; }
+    public string Name { get; set; }
 
+    [Required]
     public uint Width { get; set; }
+    [Required]
     public uint Height { get; set; }
-
-    public MapData() { }
-
   }
 }