diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/DatabaseTeam.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/DatabaseTeam.razor
new file mode 100644
index 0000000..7194bcf
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/DatabaseTeam.razor
@@ -0,0 +1,124 @@
+@page "/databaseTeam"
+@using Kysect.GithubActivityAnalyzer.WebDemo.Shared
+@using Kysect.GithubActivityAnalyzer.Aggregators.Models
+@inject HttpClient Http
+<h1>TestFunc</h1>
+<p>
+    <input @bind="_teamName" @bind:event="oninput" />
+</p>
+<p>
+    <input @bind="_username" @bind:event="oninput" />
+</p>
+<button class="btn btn-primary" @onclick="AddTeam">Add team</button>
+<button class="btn btn-primary" @onclick="DeleteTeam">Delete team</button>
+<button class="btn btn-primary" @onclick="DeleteMember">Delete member</button>
+<button class="btn btn-primary" @onclick="GetStat">Get Stat</button>
+<p>
+    <button class="btn btn-primary" @onclick="AddMember">Add member</button>
+    <button class="btn btn-primary" @onclick="ClearTeamList">Clear</button>
+</p>
+@if (_teamName == null && !_statsIsVisible)
+{
+    <p><em>Please write group name</em></p>
+}
+else
+{
+    <p>Team name: @_teamName </p>
+}
+@if (_usernames.Count == 0 && !_statsIsVisible)
+{
+    <p>Add names</p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr><th>Имя</th></tr>
+        </thead>
+        <tbody>
+            @for (int i = 0; i < _usernames.Count; i++)
+            {
+                <tr><td>@_usernames[i]</td></tr>
+            }
+        </tbody>
+    </table>
+}
+@if (_statsIsVisible)
+{
+    <p>All Contributions: @_team.TotalContributions</p>
+    <table class="table">
+        <thead>
+            <tr><th>Username</th><th>Contributions:</th></tr>
+        </thead>
+        <tbody>
+            @foreach (var person in _team.DetailedStatisticsList[0].DetailedStat)
+            {
+                <tr><td>@person.Username</td><td>@person.MonthlyContributions</td></tr>
+
+            }
+        </tbody>
+    </table>
+
+}
+
+@code {
+    private string _username = String.Empty;
+    private string _teamName = String.Empty;
+    private List<string> _usernames = new List<string>();
+    private TeamResponse _team;
+    private bool _statsIsVisible = false;
+    private bool _result;
+
+    private void ClearTeamList()
+    {
+        _usernames.Clear();
+    }
+    private void AddMember()
+    {
+        _usernames.Add(_username);
+    }
+    protected async Task GetStat()
+    {
+        Team newGroupInfo = new Team()
+        {
+            TeamName = _teamName,
+            Usernames = _usernames
+        };
+        var response = await Http.PostAsJsonAsync("Team", newGroupInfo);
+        _team = await response.Content.ReadFromJsonAsync<TeamResponse>();
+        _statsIsVisible = true;
+    }
+
+    protected async Task AddTeam()
+    {
+        Team newTeam = new Team()
+        {
+            TeamName = _teamName,
+            Usernames = _usernames
+        };
+        await Http.PostAsJsonAsync("DBTeam/addTeam", newTeam);
+    }
+    protected async Task DeleteTeam()
+    {
+        Team team = new Team()
+        {
+            TeamName = _teamName,
+            Usernames = _usernames
+        };
+        await Http.PostAsJsonAsync("DBTeam/deleteTeam", _teamName);
+    }
+    protected async Task DeleteMember()
+    {
+        await Http.PostAsJsonAsync("DBTeam/deleteMember", _username);
+    }
+
+    @*
+        protected async Task UpdateMember()
+        {
+            await Http.PostAsJsonAsync("DBTeam/updateMember");
+        }
+        protected async Task GetAllTeams()
+        {
+        }
+        protected async Task GetTeam() { }*@
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/FetchData.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/FetchData.razor
deleted file mode 100644
index 43e1a0a..0000000
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/FetchData.razor
+++ /dev/null
@@ -1,46 +0,0 @@
-@page "/fetchdata"
-@using Kysect.GithubActivityAnalyzer.WebDemo.Shared
-@inject HttpClient Http
-
-<h1>Weather forecast</h1>
-
-<p>This component demonstrates fetching data from the server.</p>
-
-@if (forecasts == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <table class="table">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th>Temp. (C)</th>
-                <th>Temp. (F)</th>
-                <th>Summary</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var forecast in forecasts)
-            {
-                <tr>
-                    <td>@forecast.Date.ToShortDateString()</td>
-                    <td>@forecast.TemperatureC</td>
-                    <td>@forecast.TemperatureF</td>
-                    <td>@forecast.Summary</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-}
-
-@code {
-    private WeatherForecast[] forecasts;
-
-    protected override async Task OnInitializedAsync()
-    {
-        forecasts = await Http.GetFromJsonAsync<WeatherForecast[]>("WeatherForecast");
-    }
-
-}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetStudyGroup.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetStudyGroup.razor
deleted file mode 100644
index 6284dc6..0000000
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetStudyGroup.razor
+++ /dev/null
@@ -1,84 +0,0 @@
-@page "/getstudyGroup"
-@using Kysect.GithubActivityAnalyzer.WebDemo.Shared
-@using Kysect.GithubActivityAnalyzer.Aggregators.Models
-@inject HttpClient Http
-<h1>TestFunc</h1>
-<p>
-    <input @bind="GroupName" @bind:event="oninput" />
-</p>
-<p>
-    <input @bind="Username" @bind:event="oninput" />
-</p>
-<button class="btn btn-primary" @onclick="AddStudent">Add student</button>
-<p>
-    <button class="btn btn-primary" @onclick="GetStat">Get Stat</button>
-</p>
-@if (GroupName == null && !StatsIsVisible)
-{
-    <p><em>Please write group name</em></p>
-}
-else
-{
-    <p>Group name: @GroupName </p>
-}
-@if (Usernames.Count == 0 && !StatsIsVisible)
-{
-    <p>Add names</p>
-}
-else
-{
-    <table class="table">
-        <thead>
-            <tr><th>Имя</th></tr>
-        </thead>
-        <tbody>
-            @for (int i = 0; i < Usernames.Count; i++)
-            {
-                <tr><td>@Usernames[i]</td></tr>
-            }
-        </tbody>
-    </table>
-}
-@if (StatsIsVisible)
-{
-    <p>All Contributions: @_studyGroup.TotalContributions</p>
-    <table class="table">
-        <thead>
-            <tr><th>Username</th><th>Contributions:</th></tr>
-        </thead>
-        <tbody>
-            @foreach (var person in _studyGroup.DetailedStatisticsList[0].DetailedStat)
-            {
-                <tr><td>@person.Username</td><td>@person.MonthlyContributions</td></tr>
-
-            }
-        </tbody>
-    </table>
-
-}
-
-@code {
-    private string Username { get; set; } = String.Empty;
-    private string GroupName { get; set; } = String.Empty;
-    private List<string> Usernames { get; set; } = new List<string>();
-    private StudyGroupResponse _studyGroup;
-    private bool StatsIsVisible { get; set; } = false;
-
-
-    protected async Task GetStat()
-    {
-        GroupStatRequest newGroupInfo = new GroupStatRequest()
-        {
-            GroupName = GroupName,
-            usernames = Usernames
-        };
-        var response = await Http.PostAsJsonAsync("StudyGroup", newGroupInfo);
-        _studyGroup = await response.Content.ReadFromJsonAsync<StudyGroupResponse>();
-        StatsIsVisible = true;
-    }
-
-    private void AddStudent()
-    {
-        Usernames.Add(Username);
-    }
-}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetTeam.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetTeam.razor
new file mode 100644
index 0000000..3f7b376
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/GetTeam.razor
@@ -0,0 +1,84 @@
+@page "/Team"
+@using Kysect.GithubActivityAnalyzer.WebDemo.Shared
+@using Kysect.GithubActivityAnalyzer.Aggregators.Models
+@inject HttpClient Http
+<h1>TestFunc</h1>
+<p>
+    <input @bind="_teamName" @bind:event="oninput" />
+</p>
+<p>
+    <input @bind="_username" @bind:event="oninput" />
+</p>
+<button class="btn btn-primary" @onclick="AddStudent">Add member</button>
+<p>
+    <button class="btn btn-primary" @onclick="GetStat">Get Stat</button>
+</p>
+@if (_teamName == null && !_statsIsVisible)
+{
+    <p><em>Please write team name</em></p>
+}
+else
+{
+    <p>Team name: @_teamName </p>
+}
+@if (_usernames.Count == 0 && !_statsIsVisible)
+{
+    <p>Add names</p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr><th>Имя</th></tr>
+        </thead>
+        <tbody>
+            @for (int i = 0; i < _usernames.Count; i++)
+            {
+                <tr><td>@_usernames[i]</td></tr>
+            }
+        </tbody>
+    </table>
+}
+@if (_statsIsVisible)
+{
+    <p>All Contributions: @_team.TotalContributions</p>
+    <table class="table">
+        <thead>
+            <tr><th>Username</th><th>Contributions:</th></tr>
+        </thead>
+        <tbody>
+            @foreach (var person in _team.DetailedStatisticsList[0].DetailedStat)
+            {
+                <tr><td>@person.Username</td><td>@person.MonthlyContributions</td></tr>
+
+            }
+        </tbody>
+    </table>
+
+}
+
+@code {
+    private string _username = String.Empty;
+    private string _teamName = String.Empty;
+    private List<string> _usernames = new List<string>();
+    private TeamResponse _team;
+    private bool _statsIsVisible = false;
+
+
+    protected async Task GetStat()
+    {
+        Team newTeamInfo = new Team()
+        {
+            TeamName = _teamName,
+            Usernames = _usernames
+        };
+        var response = await Http.PostAsJsonAsync("Team", newTeamInfo);
+        _team = await response.Content.ReadFromJsonAsync<TeamResponse>();
+        _statsIsVisible = true;
+    }
+
+    private void AddStudent()
+    {
+        _usernames.Add(_username);
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/TestPage.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/TestPage.razor
index b6bbb16..5b1e9f8 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/TestPage.razor
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Pages/TestPage.razor
@@ -1,37 +1,42 @@
 @page "/testpage"
-@using System.Text.Json
 @using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses
 @inject HttpClient Http
 <h1>TestFunc</h1>
 <p>
-    <input @bind="SetName" @bind:event="oninput" />
+    <input @bind="_setName" @bind:event="oninput" />
 </p>
-<button class="btn btn-primary" @onclick="CreateClient">Click me</button>
-@if(SetName == null)
+<button class="btn btn-primary" @onclick="GetActivityFromGithub">From Github</button>
+<button class="btn btn-primary" @onclick="GetActivityFromDB">From DB</button>
+@if(_setName == null)
 {
     <p><em>Please write name</em></p>
 }
 else
 {
-    <p>Name: @SetName </p>
+    <p>Name: @_setName </p>
 }
-@if (Info == null)
+@if (_info == null)
 {
     <p>Please wait...</p>
 }
 else
 {
-    <p>Contributions: @Info.Total</p>
+    <p>Contributions: @_info.Total</p>
 }
 
 @code {
-    private string SetName { get; set; } = String.Empty;
-    private ActivityInfo Info { get; set; }
+    private string _setName = String.Empty;
+    private ActivityInfo _info;
 
 
 
-    protected async Task CreateClient()
+    protected async Task GetActivityFromGithub()
     {
-        Info = await Http.GetFromJsonAsync<ActivityInfo>($"GitHubApi?username={SetName}");
+        _info = await Http.GetFromJsonAsync<ActivityInfo>($"GitHubApi/fromGithub?username={_setName}");
+    }
+
+    protected async Task GetActivityFromDB()
+    {
+        _info = await Http.GetFromJsonAsync<ActivityInfo>($"GitHubApi/fromDB?username={_setName}");
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor
index e2366cb..f51aaaf 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Client/Shared/NavMenu.razor
@@ -18,18 +18,18 @@
             </NavLink>
         </li>
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-plus" aria-hidden="true"></span> Fetch data
+            <NavLink class="nav-link" href="testpage">
+                <span class="oi oi-plus" aria-hidden="true"></span> Test Page
             </NavLink>
         </li>
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="testpage">
-                <span class="oi oi-plus" aria-hidden="true"></span> Test Page
+            <NavLink class="nav-link" href="Team">
+                <span class="oi oi-plus" aria-hidden="true"></span> Team
             </NavLink>
         </li>
         <li class="nav-item px-3">
-            <NavLink class="nav-link" href="getstudygroup">
-                <span class="oi oi-plus" aria-hidden="true"></span> StudyGroup
+            <NavLink class="nav-link" href="databaseTeam">
+                <span class="oi oi-plus" aria-hidden="true"></span> DatabaseTeam
             </NavLink>
         </li>
     </ul>
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
new file mode 100644
index 0000000..637d300
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DBTeamController.cs
@@ -0,0 +1,50 @@
+using Kysect.GithubActivityAnalyzer.WebDemo.Server.Services;
+using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
+{
+    [ApiController]
+    [Route("[controller]")]
+    public class DBTeamController : Controller
+    {
+        private readonly ITeamService _teamService;
+        public DBTeamController(ITeamService teamService)
+        {
+            _teamService = teamService;
+        }
+
+        [HttpPost("addTeam")]
+        public void AddTeam(Team newTeam)
+        {
+            _teamService.AddTeam(newTeam);
+        }
+
+        [HttpPost("deleteTeam")]
+        public void DeleteTeam(string teamName)
+        {
+            _teamService.DeleteTeam(teamName);
+        }  
+
+        [HttpPost("deleteMember")]
+        public void DeleteMember(string username)
+        {
+            _teamService.DeleteMember(username);
+        }
+
+        [HttpPost("updateMember")]
+        public void UpdateMember()
+        {
+        }
+
+        [HttpGet("GetAllTeams")]
+        public void GetAllTeams()
+        {
+        }
+
+        [HttpGet("GetTeam")]
+        public void GetTeam()
+        {
+        }
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DetailedGroupStatController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DetailedTeamStatController.cs
similarity index 61%
rename from Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DetailedGroupStatController.cs
rename to Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DetailedTeamStatController.cs
index 895e880..0b72ef9 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DetailedGroupStatController.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/DetailedTeamStatController.cs
@@ -1,19 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
 using Kysect.GithubActivityAnalyzer.ApiAccessor;
-using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
+
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
 {
     [ApiController]
     [Route("[controller]")]
-    public class DetailedGroupStatController : Controller
+    public class DetailedTeamStatController : Controller
     {
-        private GithubActivityProvider _provider = new GithubActivityProvider();
+        private readonly GithubActivityProvider _provider = new GithubActivityProvider();
 
          /*[HttpPost]
        public IEnumerable<GroupInfo> GetGroupInfos(DetaiedStatRequest request)
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/GitHubApiController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/GitHubApiController.cs
index 466a021..d0b705a 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/GitHubApiController.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/GitHubApiController.cs
@@ -1,6 +1,5 @@
-using System.Text.Json;
-using Kysect.GithubActivityAnalyzer.ApiAccessor;
-using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses;
+using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses;
+using Kysect.GithubActivityAnalyzer.WebDemo.Server.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
@@ -9,12 +8,22 @@ namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
   [Route("[controller]")]
     public class GitHubApiController : Controller
     {
-        private GithubActivityProvider provider = new GithubActivityProvider();
+        private readonly IActivityService _activityService;
+        public GitHubApiController(IActivityService activityService)
+        {
+            _activityService = activityService;
+        }
+
+        [HttpGet("fromGithub")]
+        public ActivityInfo OnGetFromGithub(string username)
+        {
+            return _activityService.GetActivityInfoFromGithub(username).Result;
+        }
 
-        [HttpGet]
-        public ActivityInfo Get(string username)
+        [HttpGet("FromDB")]
+        public ActivityInfo OnGetFromDB(string username)
         {
-            return provider.GetActivityInfo(username).Result;
+            return _activityService.GetActivityInfoFromDB(username);
         }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/StudyGroupController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
similarity index 55%
rename from Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/StudyGroupController.cs
rename to Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
index 1f64bfe..8ed4b79 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/StudyGroupController.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/TeamController.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using System.Text.Json;
 using Kysect.GithubActivityAnalyzer.Aggregators;
 using Kysect.GithubActivityAnalyzer.Aggregators.Models;
 using Kysect.GithubActivityAnalyzer.ApiAccessor;
@@ -9,14 +8,14 @@ namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
 {
     [ApiController]
     [Route("[controller]")]
-    public class StudyGroupController : Controller
+    public class TeamController : Controller
     {
-        private GithubActivityProvider _provider = new GithubActivityProvider();
+        private readonly GithubActivityProvider _provider = new GithubActivityProvider();
 
         [HttpPost]
-        public StudyGroupResponse GetStudyGroup(GroupStatRequest info)
+        public TeamResponse GetStudyGroup(Shared.Team info)
         {
-            return new StudyGroupResponse(new StudyGroup(info.GroupName, info.usernames, _provider)); 
+            return new TeamResponse(new Aggregators.Team(info.TeamName, info.Usernames, _provider)); 
         }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/WeatherForecastController.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/WeatherForecastController.cs
deleted file mode 100644
index 21430b7..0000000
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Controllers/WeatherForecastController.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
-
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
-    {
-        private static readonly string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
-
-        private readonly ILogger<WeatherForecastController> _logger;
-
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            _logger = logger;
-        }
-
-        [HttpGet]
-        public IEnumerable<WeatherForecast> Get()
-        {
-            var rng = new Random();
-            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateTime.Now.AddDays(index),
-                TemperatureC = rng.Next(-20, 55),
-                Summary = Summaries[rng.Next(Summaries.Length)]
-            })
-            .ToArray();
-        }
-    }
-}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Kysect.GithubActivityAnalyzer.WebDemo.Server.csproj b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Kysect.GithubActivityAnalyzer.WebDemo.Server.csproj
index 1ac373f..65b48ac 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Kysect.GithubActivityAnalyzer.WebDemo.Server.csproj
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Kysect.GithubActivityAnalyzer.WebDemo.Server.csproj
@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Program.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Program.cs
index 47f98a9..f3280ea 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Program.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Program.cs
@@ -1,13 +1,8 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
+using Kysect.GithubActivityAnalyzer.Data.Contexts;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server
 {
@@ -15,7 +10,15 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
+            var host = CreateHostBuilder(args).Build();
+
+            var scope = host.Services.CreateScope();
+            var activityContext = scope.ServiceProvider.GetService<ActivityContext>();
+            activityContext.Database.EnsureCreated(); 
+            var studentsGroupContext = scope.ServiceProvider.GetService<TeamContext>();
+            studentsGroupContext.Database.EnsureCreated();
+
+            host.Run();
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ActivityService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ActivityService.cs
new file mode 100644
index 0000000..c597b40
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ActivityService.cs
@@ -0,0 +1,28 @@
+using Kysect.GithubActivityAnalyzer.ApiAccessor;
+using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses;
+using Kysect.GithubActivityAnalyzer.Data.Repositories;
+using System.Threading.Tasks;
+
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Services
+{
+    public class ActivityService : IActivityService
+    {
+        private readonly GithubActivityProvider _githubActivityProvider;
+        private readonly UserCacheRepository _userСacheRepository;
+        public ActivityService(UserCacheRepository userСacheRepository, GithubActivityProvider githubActivityProvider)
+        {
+            this._userСacheRepository = userСacheRepository;
+            this._githubActivityProvider = githubActivityProvider;
+        }
+
+        public async Task<ActivityInfo> GetActivityInfoFromGithub(string username)
+        {
+            return await _githubActivityProvider.GetActivityInfo(username);
+        }
+
+        public ActivityInfo GetActivityInfoFromDB(string username)
+        {
+            return _userСacheRepository.GetActivityFromUserCash(_userСacheRepository.FindByUsername(username));
+        }
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/IActivityService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/IActivityService.cs
new file mode 100644
index 0000000..add3b58
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/IActivityService.cs
@@ -0,0 +1,14 @@
+using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Services
+{
+    public interface IActivityService
+    {
+        public Task<ActivityInfo> GetActivityInfoFromGithub(string username);
+        public ActivityInfo GetActivityInfoFromDB(string username);
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
new file mode 100644
index 0000000..0db47f8
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/ITeamService.cs
@@ -0,0 +1,20 @@
+using Kysect.GithubActivityAnalyzer.Data.Entities;
+using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
+using System.Linq;
+
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Services
+{
+    public interface ITeamService
+    {
+        public void AddTeam(Team team);
+        public void DeleteTeam(string teamName);
+        public void UpdateMember(string username, string teamName);
+        public void DeleteMember(string username);
+
+        //TODO: разобраться с возвращаемым значением
+        public void GetAllTeams();
+
+        //TODO: разобраться с возвращаемым значением
+        public IQueryable<Member> GetTeam(string teamName);
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
new file mode 100644
index 0000000..ed234ca
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Services/TeamService.cs
@@ -0,0 +1,45 @@
+using Kysect.GithubActivityAnalyzer.WebDemo.Shared;
+using Kysect.GithubActivityAnalyzer.Data.Repositories;
+using Kysect.GithubActivityAnalyzer.Data.Entities;
+using System.Linq;
+
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Server.Services
+{
+    public class TeamService : ITeamService
+    {
+        private readonly TeamRepository _teamRepository;
+        public TeamService(TeamRepository teamRepository)
+        {
+            _teamRepository = teamRepository;
+        }
+        public void AddTeam(Team newTeam) 
+        {
+            foreach (var username in newTeam.Usernames)
+            {
+                _teamRepository.Create(new Member() { Username = username, Team = newTeam.TeamName });
+            }
+        }
+        public void DeleteTeam(string teamName)
+        {
+            _teamRepository.DeleteByTeam(teamName);
+        }
+        public void UpdateMember(string username, string teamName)
+        {
+            _teamRepository.Update(new Member { Team = teamName, Username = username });
+        }
+        public void DeleteMember(string username)
+        {
+            _teamRepository.DeleteByUsername(username);
+        }
+
+        //TODO: Уточнить с ТЗ и реализовать
+        void ITeamService.GetAllTeams()
+        {
+            throw new System.NotImplementedException();
+        }
+        IQueryable<Member> ITeamService.GetTeam(string teamName)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Startup.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Startup.cs
index bdf59c1..c5ce748 100644
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Server/Startup.cs
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Server/Startup.cs
@@ -6,6 +6,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Kysect.GithubActivityAnalyzer.Data.Contexts;
+using Microsoft.EntityFrameworkCore;
+using Kysect.GithubActivityAnalyzer.WebDemo.Server.Services;
+using Kysect.GithubActivityAnalyzer.Data.Repositories;
+using Kysect.GithubActivityAnalyzer.ApiAccessor;
 
 namespace Kysect.GithubActivityAnalyzer.WebDemo.Server
 {
@@ -36,6 +41,23 @@ public void ConfigureServices(IServiceCollection services)
                                .AllowAnyHeader();
                     });
             });
+            services.AddDbContext<ActivityContext>(options =>
+            {
+                options.UseSqlite($"Data Source= ActivityDB.db");
+            });
+            services.AddDbContext<TeamContext>(options =>
+            {
+                options.UseSqlite($"Data Source= Teams.db");
+            });
+            services.AddScoped<DbContext, ActivityContext>();
+            services.AddScoped<DbContext, TeamContext>();
+        
+            services.AddScoped<UserCacheRepository>();
+            services.AddScoped<TeamRepository>();
+            services.AddScoped<GithubActivityProvider>();
+
+            services.AddScoped<IActivityService, ActivityService>();
+            services.AddScoped<ITeamService, TeamService>();
             services.AddControllers();
         }
 
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Shared/GroupStatRequest.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Shared/GroupStatRequest.cs
deleted file mode 100644
index e4dc42d..0000000
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Shared/GroupStatRequest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Kysect.GithubActivityAnalyzer.WebDemo.Shared
-{
-   public class GroupStatRequest
-   {
-        public string GroupName { get; set; }
-        public List<string> usernames { get; set; }
-
-        public GroupStatRequest()
-        { }
-
-        public GroupStatRequest(string groupName)
-        {
-            GroupName = groupName;
-        }
-   }
-}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Shared/Team.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Shared/Team.cs
new file mode 100644
index 0000000..1803eab
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer.WebDemo/Shared/Team.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace Kysect.GithubActivityAnalyzer.WebDemo.Shared
+{
+   public class Team
+   {
+        public string TeamName { get; set; }
+        public List<string> Usernames { get; set; }
+
+        public Team(){ }
+
+        public Team(string teamName)
+        {
+            TeamName = teamName;
+        }
+   }
+}
diff --git a/Kysect.GithubActivityAnalyzer.WebDemo/Shared/WeatherForecast.cs b/Kysect.GithubActivityAnalyzer.WebDemo/Shared/WeatherForecast.cs
deleted file mode 100644
index ea4b15d..0000000
--- a/Kysect.GithubActivityAnalyzer.WebDemo/Shared/WeatherForecast.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace Kysect.GithubActivityAnalyzer.WebDemo.Shared
-{
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public string Summary { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-    }
-}
diff --git a/Kysect.GithubActivityAnalyzer/Aggregators/Student.cs b/Kysect.GithubActivityAnalyzer/Aggregators/Member.cs
similarity index 89%
rename from Kysect.GithubActivityAnalyzer/Aggregators/Student.cs
rename to Kysect.GithubActivityAnalyzer/Aggregators/Member.cs
index 30570e0..d0b714c 100644
--- a/Kysect.GithubActivityAnalyzer/Aggregators/Student.cs
+++ b/Kysect.GithubActivityAnalyzer/Aggregators/Member.cs
@@ -4,18 +4,18 @@
 
 namespace Kysect.GithubActivityAnalyzer.Aggregators
 {
-    public class Student
+    public class Member
     {
         public string Username { get; set; }
         public ActivityInfo ActivityInfo { get; set; }
         
         public int TotalContributions => ActivityInfo.Total;
 
-        public Student()
+        public Member()
         {
         }
 
-        public Student(string username, ActivityInfo activityInfo)
+        public Member(string username, ActivityInfo activityInfo)
         {
             Username = username;
             ActivityInfo = activityInfo;
diff --git a/Kysect.GithubActivityAnalyzer/Aggregators/Models/MonthlyStatistics.cs b/Kysect.GithubActivityAnalyzer/Aggregators/Models/MonthlyStatistics.cs
index d0156b4..75057b9 100644
--- a/Kysect.GithubActivityAnalyzer/Aggregators/Models/MonthlyStatistics.cs
+++ b/Kysect.GithubActivityAnalyzer/Aggregators/Models/MonthlyStatistics.cs
@@ -7,23 +7,23 @@ namespace Kysect.GithubActivityAnalyzer.Aggregators.Models
     public class MonthlyStatistics
     {
         public DateTime Month { get; set; }
-        public List<StudentMonthlyActivity> DetailedStat { get; set; }
-        public StudentMonthlyActivity MinValueStudent { get; set; }
-        public StudentMonthlyActivity MaxValueStudent { get; set; }
+        public List<MemberMonthlyActivity> DetailedStat { get; set; }
+        public MemberMonthlyActivity MinValueMember { get; set; }
+        public MemberMonthlyActivity MaxValueMember { get; set; }
         public double AverageValue { get; set; }
         public int TotalContributions { get; set; }
 
 
-        public MonthlyStatistics(DateTime date, List<StudentMonthlyActivity> detailedStat)
+        public MonthlyStatistics(DateTime date, List<MemberMonthlyActivity> detailedStat)
         {
             DetailedStat = detailedStat;
             Month = date;
 
-                MinValueStudent = DetailedStat
+            MinValueMember = DetailedStat
                 .OrderBy(a => a.MonthlyContributions)
                 .First();
 
-                 MaxValueStudent = DetailedStat
+            MaxValueMember = DetailedStat
                 .OrderBy(a => a.MonthlyContributions)
                 .Last();
 
@@ -37,17 +37,17 @@ public MonthlyStatistics()
         }
     }
 
-    public class StudentMonthlyActivity
+    public class MemberMonthlyActivity
     {
         public string Username { get; set; }
 
         public int MonthlyContributions { get; set; }
 
-        public StudentMonthlyActivity()
+        public MemberMonthlyActivity()
         {
         }
 
-        public StudentMonthlyActivity(string username, int monthlyContributions)
+        public MemberMonthlyActivity(string username, int monthlyContributions)
         {
             Username = username;
             MonthlyContributions = monthlyContributions;
diff --git a/Kysect.GithubActivityAnalyzer/Aggregators/Models/StudyGroupResponse.cs b/Kysect.GithubActivityAnalyzer/Aggregators/Models/StudyGroupResponse.cs
deleted file mode 100644
index 208ff83..0000000
--- a/Kysect.GithubActivityAnalyzer/Aggregators/Models/StudyGroupResponse.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Kysect.GithubActivityAnalyzer.Aggregators.Models
-{
-    public class StudyGroupResponse
-    {
-        public string GroupName { get; set; }
-        public List<ShortStudentInfo> Students { get; set; }
-        public List<MonthlyStatistics> DetailedStatisticsList { get; set; }
-
-        public int TotalContributions { get; set; }
-
-        public StudyGroupResponse() { }
-        public StudyGroupResponse(StudyGroup group)
-        {
-            GroupName = group.GroupName;
-            TotalContributions = group.TotalContributions;
-            Students = group.Students.Select(a => new ShortStudentInfo(a.Username, a.TotalContributions)).ToList();
-            DetailedStatisticsList = group.Statistics;
-        }
-    }
-
-    public class ShortStudentInfo
-    {
-        public string Username { get; set; }
-
-        public int TotalContributions { get; set; }
-
-        public ShortStudentInfo() { } 
-        public ShortStudentInfo(string name, int totalContributions)
-        {
-            Username = name;
-            TotalContributions = totalContributions;
-        }
-    }
-}
diff --git a/Kysect.GithubActivityAnalyzer/Aggregators/Models/TeamResponse.cs b/Kysect.GithubActivityAnalyzer/Aggregators/Models/TeamResponse.cs
new file mode 100644
index 0000000..200217b
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer/Aggregators/Models/TeamResponse.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Kysect.GithubActivityAnalyzer.Aggregators.Models
+{
+    public class TeamResponse
+    {
+        public string TeamName { get; set; }
+        public List<ShortMemberInfo> Members { get; set; }
+        public List<MonthlyStatistics> DetailedStatisticsList { get; set; }
+
+        public int TotalContributions { get; set; }
+
+        public TeamResponse() { }
+        public TeamResponse(Team team)
+        {
+            TeamName = team.TeamName;
+            TotalContributions = team.TotalContributions;
+            Members = team.Members.Select(a => new ShortMemberInfo(a.Username, a.TotalContributions)).ToList();
+            DetailedStatisticsList = team.Statistics;
+        }
+    }
+
+    public class ShortMemberInfo
+    {
+        public string Username { get; set; }
+
+        public int TotalContributions { get; set; }
+
+        public ShortMemberInfo() { } 
+        public ShortMemberInfo(string name, int totalContributions)
+        {
+            Username = name;
+            TotalContributions = totalContributions;
+        }
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer/Aggregators/StudyGroup.cs b/Kysect.GithubActivityAnalyzer/Aggregators/Team.cs
similarity index 62%
rename from Kysect.GithubActivityAnalyzer/Aggregators/StudyGroup.cs
rename to Kysect.GithubActivityAnalyzer/Aggregators/Team.cs
index 1d26c19..ef2848f 100644
--- a/Kysect.GithubActivityAnalyzer/Aggregators/StudyGroup.cs
+++ b/Kysect.GithubActivityAnalyzer/Aggregators/Team.cs
@@ -7,79 +7,79 @@
 
 namespace Kysect.GithubActivityAnalyzer.Aggregators
 {
-    public class StudyGroup
+    public class Team
     {
-        public string GroupName { get; set; }
-        public List<Student> Students { get; set; }
+        public string TeamName { get; set; }
+        public List<Member> Members { get; set; }
         public List<MonthlyStatistics> Statistics => GetDetailedStat();
         public int TotalContributions => TotalActivity();
 
-        public StudyGroup()
+        public Team()
         {
         }
 
-        public StudyGroup(string groupName)
+        public Team(string teamName)
         {
-            GroupName = groupName;
-            Students = new List<Student>();
+            TeamName = teamName;
+            Members = new List<Member>();
         }
 
-        public StudyGroup(string groupName, List<Student> students)
+        public Team(string teamName, List<Member> members)
         {
-            GroupName = groupName;
-            Students = students;
+            TeamName = teamName;
+            Members = members;
         }
 
-        public StudyGroup(string groupName, List<string> students, GithubActivityProvider provider)
+        public Team(string teamName, List<string> members, GithubActivityProvider provider)
         {
-            GroupName = groupName;
-            Students = new List<Student>();
-            foreach ((string username, ActivityInfo activity) in provider.GetActivityInfo(students, true))
+            TeamName = teamName;
+            Members = new List<Member>();
+            foreach ((string username, ActivityInfo activity) in provider.GetActivityInfo(members, true))
             {
-                Students.Add(new Student(username, activity));
+                Members.Add(new Member(username, activity));
             }
         }
 
-        public static List<StudyGroup> CreateFromUserList(List<UserWithTag> users, GithubActivityProvider provider)
+        public static List<Team> CreateFromUserList(List<UserWithTag> users, GithubActivityProvider provider)
         {
             return users
                 .ToLookup(user => user.Tag, user => user.Username)
-                .Select(group => new StudyGroup(@group.Key, @group.ToList(), provider))
+                .Select(group => new Team(@group.Key, @group.ToList(), provider))
                 .ToList();
         }
 
         private int TotalActivity()
         {
-            return Students
+            return Members
                 .Select(k => k.TotalContributions)
                 .Sum();
         }
 
-        public void AddStudents(GithubActivityProvider provider, bool isParallel, params string[] usernames)
+        public void AddMembers(GithubActivityProvider provider, bool isParallel, params string[] usernames)
         {
             var listInfo = provider.GetActivityInfo(usernames, isParallel);
             foreach (var item in listInfo)
             {
-                Students.Add(new Student(item.Username, item.Activity));
+               Members.Add(new Member(item.Username, item.Activity));
             }
         }
 
-        public Student GetMinValueStudent(DateTime? from = null, DateTime? to = null)
+        public Member GetMinValueMember(DateTime? from = null, DateTime? to = null)
         {
             from ??= DateTime.MinValue;
             to ??= DateTime.Now;
 
-            return Students
+            return Members
                 .OrderBy(k => k.ActivityInfo.GetActivityForPeriod(from.GetValueOrDefault(), to.GetValueOrDefault()))
                 .Last();
 
         }
-        public Student GetMaxValueStudent(DateTime? from = null, DateTime? to = null)
+        public Member GetMaxValueMember(DateTime? from = null, DateTime? to = null)
         {
             from ??= DateTime.MinValue;
             to ??= DateTime.Now;
 
-            return Students
+            return Members
                 .OrderBy(k => k.ActivityInfo.GetActivityForPeriod(from.GetValueOrDefault(), to.GetValueOrDefault()))
                 .First();
 
@@ -89,7 +89,7 @@ public double GetAverageValue(DateTime? from = null, DateTime? to = null)
             from ??= DateTime.MinValue;
             to ??= DateTime.Now;
 
-            return Students
+            return Members
                 .Select(k => k.ActivityInfo.GetActivityForPeriod(from.GetValueOrDefault(), to.GetValueOrDefault()))
                 .Average();
         }
@@ -98,24 +98,24 @@ public Dictionary<string, int> GetShortInfo()
         {
             Dictionary<string, int> usersContributions = new Dictionary<string, int>();
 
-            foreach (var student in Students)
+            foreach (var member in Members)
             {
-                usersContributions.Add(student.Username, student.TotalContributions);
+                usersContributions.Add(member.Username, member.TotalContributions);
             }
             return usersContributions;
         }
 
         public int GetActivityForPeriod(DateTime from, DateTime to)
         {
-            return Students
-                .Select(student => student.ActivityInfo.GetActivityForPeriod(@from, to))
+            return Members
+                .Select(member => member.ActivityInfo.GetActivityForPeriod(@from, to))
                 .Sum();
         }
 
         public double GetAverageMonthActivity()
         {
-            return Students
-                .Select(student => Convert.ToInt32(student.ActivityInfo.PerMonthActivity()
+            return Members
+                .Select(member => Convert.ToInt32(member.ActivityInfo.PerMonthActivity()
                 .Average(c => c.Count)))
                 .ToList()
                 .Average();
@@ -123,7 +123,7 @@ public double GetAverageMonthActivity()
 
         public double GetMovingAverage(DateTime from, DateTime to)
         {
-            return Students
+            return Members
                 .Select(s => s.GetMovingAverage(from, to))
                 .Average();
         }
@@ -136,8 +136,8 @@ public List<MonthlyStatistics> GetDetailedStat(DateTime? fromDate = null, DateTi
             endTime = endTime ?? DateTime.Now;
             for (DateTime to = from.AddMonths(1); from <= endTime || from.Month == endTime.Value.Month; to = from.AddMonths(1))
             {
-                var detailedStat = this.Students
-                    .Select(student => new StudentMonthlyActivity(student.Username, student.GetActivityForPeriod(from, to)))
+                var detailedStat = this.Members
+                    .Select(member => new MemberMonthlyActivity(member.Username, member.GetActivityForPeriod(from, to)))
                     .ToList();
                 var monthStat = new MonthlyStatistics(from, detailedStat);
                 statistics.Add(monthStat);
diff --git a/Kysect.GithubActivityAnalyzer/Data/Contexts/ActivityContext.cs b/Kysect.GithubActivityAnalyzer/Data/Contexts/ActivityContext.cs
index 6faebe7..0c276bb 100644
--- a/Kysect.GithubActivityAnalyzer/Data/Contexts/ActivityContext.cs
+++ b/Kysect.GithubActivityAnalyzer/Data/Contexts/ActivityContext.cs
@@ -5,21 +5,13 @@ namespace Kysect.GithubActivityAnalyzer.Data.Contexts
 {
     public class ActivityContext : DbContext
     {
+        public ActivityContext(DbContextOptions<ActivityContext> options) : base(options) { }
         public DbSet<UserСache> UserСache { get; set; }
-
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-            => options.UseSqlite($"Data Source=..\\ActivityDB.db");
-
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<UserСache>()
                 .HasKey(b => b.Username)
                 .HasName("PrimaryKey_Username");
         }
-
-        public ActivityContext()
-        {
-            Database.EnsureCreated();
-        }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer/Data/Contexts/StudentsGroupContext.cs b/Kysect.GithubActivityAnalyzer/Data/Contexts/StudentsGroupContext.cs
deleted file mode 100644
index 2ec59e4..0000000
--- a/Kysect.GithubActivityAnalyzer/Data/Contexts/StudentsGroupContext.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Kysect.GithubActivityAnalyzer.Data.Entities;
-
-namespace Kysect.GithubActivityAnalyzer.Data.Contexts
-{
-    public class StudentsGroupContext : DbContext
-    {
-        public DbSet<StudentsGroup> StudentsGroup { get; set; }
-
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-            => options.UseSqlite($"Data Source=..\\StudentsGroup.db");
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<StudentsGroup>()
-               .HasKey(b => b.Username)
-               .HasName("PrimaryKey_Username");
-        }
-
-        public StudentsGroupContext()
-        {
-            Database.EnsureCreated();
-        }
-    }
-}
diff --git a/Kysect.GithubActivityAnalyzer/Data/Contexts/TeamContext.cs b/Kysect.GithubActivityAnalyzer/Data/Contexts/TeamContext.cs
new file mode 100644
index 0000000..cd8afbd
--- /dev/null
+++ b/Kysect.GithubActivityAnalyzer/Data/Contexts/TeamContext.cs
@@ -0,0 +1,18 @@
+using Microsoft.EntityFrameworkCore;
+using Kysect.GithubActivityAnalyzer.Data.Entities;
+
+namespace Kysect.GithubActivityAnalyzer.Data.Contexts
+{
+    public class TeamContext : DbContext
+    {
+        public DbSet<Member> Team { get; set; }
+        public TeamContext(DbContextOptions<TeamContext> options) : base(options) { }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<Member>()
+               .HasKey(b => b.Username)
+               .HasName("PrimaryKey_Username");
+        }
+    }
+}
diff --git a/Kysect.GithubActivityAnalyzer/Data/Entities/StudentsGroup.cs b/Kysect.GithubActivityAnalyzer/Data/Entities/Member.cs
similarity index 60%
rename from Kysect.GithubActivityAnalyzer/Data/Entities/StudentsGroup.cs
rename to Kysect.GithubActivityAnalyzer/Data/Entities/Member.cs
index 4295128..daebf28 100644
--- a/Kysect.GithubActivityAnalyzer/Data/Entities/StudentsGroup.cs
+++ b/Kysect.GithubActivityAnalyzer/Data/Entities/Member.cs
@@ -1,8 +1,8 @@
 namespace Kysect.GithubActivityAnalyzer.Data.Entities
 {
-    public class StudentsGroup
+    public class Member
     {
         public string Username { get; set; }
-        public string StudyGroup { get; set; }
+        public string Team { get; set; }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer/Data/Repositories/StudentsGroupRepository.cs b/Kysect.GithubActivityAnalyzer/Data/Repositories/TeamRepository.cs
similarity index 50%
rename from Kysect.GithubActivityAnalyzer/Data/Repositories/StudentsGroupRepository.cs
rename to Kysect.GithubActivityAnalyzer/Data/Repositories/TeamRepository.cs
index 436afc4..48ea746 100644
--- a/Kysect.GithubActivityAnalyzer/Data/Repositories/StudentsGroupRepository.cs
+++ b/Kysect.GithubActivityAnalyzer/Data/Repositories/TeamRepository.cs
@@ -1,36 +1,37 @@
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using Kysect.GithubActivityAnalyzer.Data.Entities;
+using Kysect.GithubActivityAnalyzer.Data.Contexts;
 
 namespace Kysect.GithubActivityAnalyzer.Data.Repositories
 {
-    public class StudentsGroupRepository : IRepository<StudentsGroup>
+    public class TeamRepository : IRepository<Member>
     {
-        readonly DbContext _context;
-        readonly DbSet<StudentsGroup> _dbSet;
+        readonly TeamContext _context;
+        readonly DbSet<Member> _dbSet;
 
-        public StudentsGroupRepository(DbContext context, DbSet<StudentsGroup> set)
+        public TeamRepository(TeamContext context)
         {
             _context = context;
-            _dbSet = set;
+            _dbSet = context.Team;
         }
 
-        public StudentsGroup Create(StudentsGroup item)
+        public Member Create(Member item)
         {
             _dbSet.Add(item);
             _context.SaveChanges();
             return item;
         }
-        public IQueryable<StudentsGroup> Get()
+        public IQueryable<Member> Get()
         {
             return _dbSet;
         }
-        public void Update(StudentsGroup item)
+        public void Update(Member item)
         {
             DeleteByUsername(item.Username);
             Create(item);
         }
-        public void Delete(StudentsGroup item)
+        public void Delete(Member item)
         {
             _dbSet.Remove(item);
             _context.SaveChanges();
@@ -39,17 +40,24 @@ public void DeleteByUsername(string username)
         {
             Delete(FindByUsername(username));
         }
-        public IQueryable<StudentsGroup> GetAll()
+        public IQueryable<Member> GetAll()
         {
             return _dbSet;
         }
-        public StudentsGroup FindByUsername(string username)
+        public Member FindByUsername(string username)
         {
             return _dbSet.Find(username);
         }
-        public IQueryable<StudentsGroup> GetAllByGroup(string studyGroup)
+        public IQueryable<Member> GetAllByTeam(string team)
         {
-            return _dbSet.Where(p => p.StudyGroup == studyGroup);
+            return _dbSet.Where(p => p.Team == team);
+        }
+        public void DeleteByTeam(string team)
+        {
+            foreach( var member in GetAllByTeam(team))
+            {
+                Delete(member);
+            }
         }
     }
 }
diff --git "a/Kysect.GithubActivityAnalyzer/Data/Repositories/User\320\241acheRepository.cs" b/Kysect.GithubActivityAnalyzer/Data/Repositories/UserCacheRepository.cs
similarity index 64%
rename from "Kysect.GithubActivityAnalyzer/Data/Repositories/User\320\241acheRepository.cs"
rename to Kysect.GithubActivityAnalyzer/Data/Repositories/UserCacheRepository.cs
index 1dfbc1b..8faf5eb 100644
--- "a/Kysect.GithubActivityAnalyzer/Data/Repositories/User\320\241acheRepository.cs"
+++ b/Kysect.GithubActivityAnalyzer/Data/Repositories/UserCacheRepository.cs
@@ -1,20 +1,22 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json;
 using Kysect.GithubActivityAnalyzer.ApiAccessor.ApiResponses;
+using Kysect.GithubActivityAnalyzer.Data.Contexts;
 using Kysect.GithubActivityAnalyzer.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace Kysect.GithubActivityAnalyzer.Data.Repositories
 {
-    public class UserСacheRepository : IRepository<UserСache>
+    public class UserCacheRepository : IRepository<UserСache>
     {
-        readonly DbContext _context;
+        readonly ActivityContext _context;
         readonly DbSet<UserСache> _dbSet;
 
-        public UserСacheRepository(DbContext context, DbSet<UserСache> set)
+        public UserCacheRepository(ActivityContext context)
         {
             _context = context;
-            _dbSet = set;
+            _dbSet = context.UserСache;
         }
 
         public IQueryable<UserСache> GetAll()
@@ -63,6 +65,20 @@ public ActivityInfo GetActivityFromUserCash(UserСache userCash)
             var activity = JsonSerializer.Deserialize<ActivityInfo>(userCash.ActivityInfo, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
             return activity;
         }
+        public List<(string Username, ActivityInfo Activity)> GetActivityFromUserCash(IEnumerable<string> usernames, bool isParallel)
+        {
+            if (!isParallel)
+            {
+                return usernames
+                    .Select(username => (username, GetActivityFromUserCash(FindByUsername(username))))
+                    .ToList();
+            }
 
+            List<(string, ActivityInfo)> result = usernames
+                .AsParallel()
+                .Select(username => (username, GetActivityFromUserCash(FindByUsername(username))))
+                .ToList();
+            return result;
+        }
     }
 }
diff --git a/Kysect.GithubActivityAnalyzer/DataExport/ExcelExportManager.cs b/Kysect.GithubActivityAnalyzer/DataExport/ExcelExportManager.cs
index 20d29c5..d2bc1c4 100644
--- a/Kysect.GithubActivityAnalyzer/DataExport/ExcelExportManager.cs
+++ b/Kysect.GithubActivityAnalyzer/DataExport/ExcelExportManager.cs
@@ -6,15 +6,15 @@ namespace Kysect.GithubActivityAnalyzer.DataExport
 {
     public class ExcelExportManager
     {
-        public List<StudyGroup> Info { get; set; }
+        public List<Team> Info { get; set; }
         private IXLWorkbook Workbook { get; }
 
-        public ExcelExportManager(List<StudyGroup> info)
+        public ExcelExportManager(List<Team> info)
         {
             Info = info;
             Workbook = new XLWorkbook();
         }
-        public ExcelExportManager(List<StudyGroup> info, IXLWorkbook workbook)
+        public ExcelExportManager(List<Team> info, IXLWorkbook workbook)
         {
             Info = info;
             Workbook = workbook;
@@ -29,7 +29,7 @@ public IXLWorkbook ExportShortInfo()
         {
             foreach (var groupInfo in Info)
             {
-                IXLWorksheet worksheet = Workbook.Worksheets.Add($"{groupInfo.GroupName}");
+                IXLWorksheet worksheet = Workbook.Worksheets.Add($"{groupInfo.TeamName}");
                 worksheet.Cell(2, 1).Value = "Среднее количество коммитов за месяц:";
                 worksheet.Cell(3, 1).Value = "Всего коммитов за месяц:";
                 worksheet.Cell(4, 1).Value = "Котик месяца:";
@@ -42,9 +42,9 @@ public IXLWorkbook ExportShortInfo()
                     worksheet.Cell(2, column).Value = groupInfo.Statistics[column - 2].AverageValue;
                     worksheet.Cell(3, column).Value = groupInfo.Statistics[column - 2].TotalContributions;
                     worksheet.Cell(4, column).Value =
-                        groupInfo.Statistics[column-2].MaxValueStudent.Username + ":" + groupInfo.Statistics[column - 2].MaxValueStudent.MonthlyContributions;
+                        groupInfo.Statistics[column-2].MaxValueMember.Username + ":" + groupInfo.Statistics[column - 2].MaxValueMember.MonthlyContributions;
                     worksheet.Cell(5, column).Value =
-                        groupInfo.Statistics[column - 2].MinValueStudent.Username + ":" + groupInfo.Statistics[column - 2].MinValueStudent.MonthlyContributions;
+                        groupInfo.Statistics[column - 2].MinValueMember.Username + ":" + groupInfo.Statistics[column - 2].MinValueMember.MonthlyContributions;
                 }
                 worksheet.Columns().AdjustToContents();
                 worksheet.Rows().AdjustToContents();
@@ -56,11 +56,11 @@ public IXLWorkbook ExportDetailedInfo()
         {
             foreach (var info in Info)
             {
-                IXLWorksheet worksheetDetailed = Workbook.Worksheets.Add($"{info.GroupName}-DetailedStat");
+                IXLWorksheet worksheetDetailed = Workbook.Worksheets.Add($"{info.TeamName}-DetailedStat");
 
-                for (int row = 2; row < info.Students.Count + 2; row++)
+                for (int row = 2; row < info.Members.Count + 2; row++)
                 {
-                    worksheetDetailed.Cell(row, 1).Value = info.Students[row - 2].Username;
+                    worksheetDetailed.Cell(row, 1).Value = info.Members[row - 2].Username;
                 }
                 int column = 2;
 
diff --git a/Kysect.GithubActivityAnalyzer/Services/ExcelExportManager.cs b/Kysect.GithubActivityAnalyzer/Services/ExcelExportManager.cs
index dc96936..9da1198 100644
--- a/Kysect.GithubActivityAnalyzer/Services/ExcelExportManager.cs
+++ b/Kysect.GithubActivityAnalyzer/Services/ExcelExportManager.cs
@@ -7,15 +7,15 @@ namespace Kysect.GithubActivityAnalyzer.Services
 {
     public class ExcelExportManager
     {
-        public List<StudyGroup> Info { get; set; }
+        public List<Team> Info { get; set; }
         private IXLWorkbook Workbook { get; }
 
-        public ExcelExportManager(List<StudyGroup> info)
+        public ExcelExportManager(List<Team> info)
         {
             Info = info;
             Workbook = new XLWorkbook();
         }
-        public ExcelExportManager(List<StudyGroup> info, IXLWorkbook workbook)
+        public ExcelExportManager(List<Team> info, IXLWorkbook workbook)
         {
             Info = info;
             Workbook = workbook;
@@ -28,24 +28,24 @@ public void SaveExcel(string path)
 
         public IXLWorkbook ExportShortInfo()
         {
-            foreach (var groupInfo in Info)
+            foreach (var teamInfo in Info)
             {
-                IXLWorksheet worksheet = Workbook.Worksheets.Add($"{groupInfo.GroupName}");
+                IXLWorksheet worksheet = Workbook.Worksheets.Add($"{teamInfo.TeamName}");
                 worksheet.Cell(2, 1).Value = "Среднее количество коммитов за месяц:";
                 worksheet.Cell(3, 1).Value = "Всего коммитов за месяц:";
                 worksheet.Cell(4, 1).Value = "Котик месяца:";
                 worksheet.Cell(5, 1).Value = "Кандидат на ремень по жопе:";
                 worksheet.Row(1).SetDataType(XLDataType.Text);
-                for(int column = 2; column<groupInfo.Statistics.Count + 2; column++)
+                for(int column = 2; column<teamInfo.Statistics.Count + 2; column++)
                 {
-                    worksheet.Cell(1, column).Value = groupInfo.Statistics[column-2].Month;
+                    worksheet.Cell(1, column).Value = teamInfo.Statistics[column-2].Month;
                     worksheet.Cell(1, column).Style.DateFormat.Format = "MMMM-yyyy";
-                    worksheet.Cell(2, column).Value = groupInfo.Statistics[column - 2].AverageValue;
-                    worksheet.Cell(3, column).Value = groupInfo.Statistics[column - 2].TotalContributions;
+                    worksheet.Cell(2, column).Value = teamInfo.Statistics[column - 2].AverageValue;
+                    worksheet.Cell(3, column).Value = teamInfo.Statistics[column - 2].TotalContributions;
                     worksheet.Cell(4, column).Value =
-                        groupInfo.Statistics[column-2].MaxValueStudent.Username + ":" + groupInfo.Statistics[column - 2].MaxValueStudent.MonthlyContributions;
+                        teamInfo.Statistics[column-2].MaxValueMember.Username + ":" + teamInfo.Statistics[column - 2].MaxValueMember.MonthlyContributions;
                     worksheet.Cell(5, column).Value =
-                        groupInfo.Statistics[column - 2].MinValueStudent.Username + ":" + groupInfo.Statistics[column - 2].MinValueStudent.MonthlyContributions;
+                        teamInfo.Statistics[column - 2].MinValueMember.Username + ":" + teamInfo.Statistics[column - 2].MinValueMember.MonthlyContributions;
                 }
                 worksheet.Columns().AdjustToContents();
                 worksheet.Rows().AdjustToContents();
@@ -57,11 +57,11 @@ public IXLWorkbook ExportDetailedInfo()
         {
             foreach (var info in Info)
             {
-                IXLWorksheet worksheetDetailed = Workbook.Worksheets.Add($"{info.GroupName}-DetailedStat");
+                IXLWorksheet worksheetDetailed = Workbook.Worksheets.Add($"{info.TeamName}-DetailedStat");
 
-                for (int row = 2; row < info.Students.Count + 2; row++)
+                for (int row = 2; row < info.Members.Count + 2; row++)
                 {
-                    worksheetDetailed.Cell(row, 1).Value = info.Students[row - 2].Username;
+                    worksheetDetailed.Cell(row, 1).Value = info.Members[row - 2].Username;
                 }
                 int column = 2;
 
@@ -118,7 +118,7 @@ public IXLWorkbook ExportSummaryInfo()
             int column = 2;
             foreach (var info in Info)
             {
-                worksheetSummary.Cell(row, 1).Value = info.GroupName;
+                worksheetSummary.Cell(row, 1).Value = info.TeamName;
 
                 foreach (var statistic in info.Statistics)
                 {