diff --git a/BlazorApp/BlazorApp/BlazorApp.csproj b/BlazorApp/BlazorApp/BlazorApp.csproj
index 52bf0b1..cd54721 100644
--- a/BlazorApp/BlazorApp/BlazorApp.csproj
+++ b/BlazorApp/BlazorApp/BlazorApp.csproj
@@ -15,5 +15,9 @@
 
   <ItemGroup>
     <None Remove="Blazored.LocalStorage" />
+    <None Remove="Services\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Services\" />
   </ItemGroup>
 </Project>
diff --git a/BlazorApp/BlazorApp/Pages/Add.razor.cs b/BlazorApp/BlazorApp/Pages/Add.razor.cs
index 75073fe..79ad60a 100644
--- a/BlazorApp/BlazorApp/Pages/Add.razor.cs
+++ b/BlazorApp/BlazorApp/Pages/Add.razor.cs
@@ -1,5 +1,6 @@
 using System;
 using BlazorApp.Models;
+using BlazorApp.Services;
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
@@ -17,6 +18,9 @@ namespace BlazorApp.Pages
         [Inject]
         public NavigationManager NavigationManager { get; set; }
 
+        [Inject]
+        public IDataService DataService { get; set; }
+
         /// <summary>
         /// The default enchant categories.
         /// </summary>
@@ -38,44 +42,8 @@ namespace BlazorApp.Pages
 
         private async void HandleValidSubmit()
         {
-            // Get the current data
-            var currentData = await LocalStorage.GetItemAsync<List<Item>>("data");
-
-            // Simulate the Id
-            itemModel.Id = currentData.Max(s => s.Id) + 1;
+            await DataService.Add(itemModel);
 
-            // Add the item to the current data
-            currentData.Add(new Item
-            {
-                Id = itemModel.Id,
-                DisplayName = itemModel.DisplayName,
-                Name = itemModel.Name,
-                RepairWith = itemModel.RepairWith,
-                EnchantCategories = itemModel.EnchantCategories,
-                MaxDurability = itemModel.MaxDurability,
-                StackSize = itemModel.StackSize,
-                CreatedDate = DateTime.Now
-            });
-
-            // Save the image
-            var imagePathInfo = new DirectoryInfo($"{WebHostEnvironment.WebRootPath}/images");
-
-            // Check if the folder "images" exist
-            if (!imagePathInfo.Exists)
-            {
-                imagePathInfo.Create();
-            }
-
-            // Determine the image name
-            var fileName = new FileInfo($"{imagePathInfo}/{itemModel.Name}.png");
-
-            // Write the file content
-            await File.WriteAllBytesAsync(fileName.FullName, itemModel.ImageContent);
-
-            // Save the data
-            await LocalStorage.SetItemAsync("data", currentData);
-
-            NavigationManager.NavigateTo("list");
             NavigationManager.NavigateTo("list");
         }
 
diff --git a/BlazorApp/BlazorApp/Pages/Edit.razor b/BlazorApp/BlazorApp/Pages/Edit.razor
new file mode 100644
index 0000000..34d55a3
--- /dev/null
+++ b/BlazorApp/BlazorApp/Pages/Edit.razor
@@ -0,0 +1,5 @@
+@page "/edit/{Id:int}"
+
+<h3>Edit</h3>
+
+<div>My paremeter: @Id</div>
diff --git a/BlazorApp/BlazorApp/Pages/Edit.razor.cs b/BlazorApp/BlazorApp/Pages/Edit.razor.cs
new file mode 100644
index 0000000..be21d60
--- /dev/null
+++ b/BlazorApp/BlazorApp/Pages/Edit.razor.cs
@@ -0,0 +1,13 @@
+using System;
+using Microsoft.AspNetCore.Components;
+
+namespace BlazorApp.Pages
+{
+    public partial class Edit
+    {
+        [Parameter]
+        public int Id { get; set; }
+
+    }
+}
+
diff --git a/BlazorApp/BlazorApp/Pages/List.razor b/BlazorApp/BlazorApp/Pages/List.razor
index 0fba8df..6ed4807 100644
--- a/BlazorApp/BlazorApp/Pages/List.razor
+++ b/BlazorApp/BlazorApp/Pages/List.razor
@@ -78,4 +78,9 @@
         </DisplayTemplate>
     </DataGridColumn>
     <DataGridColumn TItem="Item" Field="@nameof(Item.CreatedDate)" Caption="Created date" DisplayFormat="{0:d}" DisplayFormatProvider="@System.Globalization.CultureInfo.GetCultureInfo("fr-FR")" />
+    <DataGridColumn TItem="Item" Field="@nameof(Item.Id)" Caption="Action">
+        <DisplayTemplate>
+            <a href="Edit/@(context.Id)" class="btn btn-primary"><i class="fa fa-edit"></i> Editer</a>
+        </DisplayTemplate>
+    </DataGridColumn>
 </DataGrid>
\ No newline at end of file
diff --git a/BlazorApp/BlazorApp/Pages/List.razor.cs b/BlazorApp/BlazorApp/Pages/List.razor.cs
index aeab560..361129a 100644
--- a/BlazorApp/BlazorApp/Pages/List.razor.cs
+++ b/BlazorApp/BlazorApp/Pages/List.razor.cs
@@ -1,4 +1,5 @@
 using BlazorApp.Models;
+using BlazorApp.Services;
 using Blazored.LocalStorage;
 using Blazorise.DataGrid;
 using Microsoft.AspNetCore.Components;
@@ -23,6 +24,9 @@ namespace BlazorApp.Pages
         [Inject]
         public IWebHostEnvironment WebHostEnvironment { get; set; }
 
+        [Inject]
+        public IDataService DataService { get; set; }
+
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             // Do not treat this action if is not the first render
@@ -49,14 +53,10 @@ namespace BlazorApp.Pages
                 return;
             }
 
-            // When you use a real API, we use this follow code
-            //var response = await Http.GetJsonAsync<Data[]>( $"http://my-api/api/data?page={e.Page}&pageSize={e.PageSize}" );
-            var response = (await LocalStorage.GetItemAsync<Item[]>("data")).Skip((e.Page - 1) * e.PageSize).Take(e.PageSize).ToList();
-
             if (!e.CancellationToken.IsCancellationRequested)
             {
-                totalItem = (await LocalStorage.GetItemAsync<List<Item>>("data")).Count;
-                items = new List<Item>(response); // an actual data for the current page
+                items = await DataService.List(e.Page, e.PageSize);
+                totalItem = await DataService.Count();
             }
         }
     }
diff --git a/BlazorApp/BlazorApp/Program.cs b/BlazorApp/BlazorApp/Program.cs
index e18b8e2..53eaa40 100644
--- a/BlazorApp/BlazorApp/Program.cs
+++ b/BlazorApp/BlazorApp/Program.cs
@@ -1,4 +1,5 @@
 using BlazorApp.Data;
+using BlazorApp.Services;
 using Blazored.LocalStorage;
 using Blazorise;
 using Blazorise.Bootstrap;
@@ -20,6 +21,8 @@ builder.Services
 
 builder.Services.AddBlazoredLocalStorage();
 
+builder.Services.AddScoped<IDataService, DataLocalService>();
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
diff --git a/BlazorApp/BlazorApp/Services/DataLocalService.cs b/BlazorApp/BlazorApp/Services/DataLocalService.cs
new file mode 100644
index 0000000..1a1d806
--- /dev/null
+++ b/BlazorApp/BlazorApp/Services/DataLocalService.cs
@@ -0,0 +1,159 @@
+using System;
+using BlazorApp.Models;
+using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components;
+
+namespace BlazorApp.Services
+{
+    public class DataLocalService : IDataService
+    {
+        private readonly HttpClient _http;
+        private readonly ILocalStorageService _localStorage;
+        private readonly NavigationManager _navigationManager;
+        private readonly IWebHostEnvironment _webHostEnvironment;
+
+        public DataLocalService(
+            ILocalStorageService localStorage,
+            HttpClient http,
+            IWebHostEnvironment webHostEnvironment,
+            NavigationManager navigationManager)
+        {
+            _localStorage = localStorage;
+            _http = http;
+            _webHostEnvironment = webHostEnvironment;
+            _navigationManager = navigationManager;
+        }
+
+        public async Task Add(ItemModel model)
+        {
+            // Get the current data
+            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
+
+            // Simulate the Id
+            model.Id = currentData.Max(s => s.Id) + 1;
+
+            // Add the item to the current data
+            currentData.Add(new Item
+            {
+                Id = model.Id,
+                DisplayName = model.DisplayName,
+                Name = model.Name,
+                RepairWith = model.RepairWith,
+                EnchantCategories = model.EnchantCategories,
+                MaxDurability = model.MaxDurability,
+                StackSize = model.StackSize,
+                CreatedDate = DateTime.Now
+            });
+
+            // Save the image
+            var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images");
+
+            // Check if the folder "images" exist
+            if (!imagePathInfo.Exists)
+            {
+                imagePathInfo.Create();
+            }
+
+            // Determine the image name
+            var fileName = new FileInfo($"{imagePathInfo}/{model.Name}.png");
+
+            // Write the file content
+            await File.WriteAllBytesAsync(fileName.FullName, model.ImageContent);
+
+            // Save the data
+            await _localStorage.SetItemAsync("data", currentData);
+        }
+
+        public async Task<int> Count()
+        {
+            return (await _localStorage.GetItemAsync<Item[]>("data")).Length;
+        }
+
+        public async Task<List<Item>> List(int currentPage, int pageSize)
+        {
+            // Load data from the local storage
+            var currentData = await _localStorage.GetItemAsync<Item[]>("data");
+
+            // Check if data exist in the local storage
+            if (currentData == null)
+            {
+                // this code add in the local storage the fake data
+                var originalData = await _http.GetFromJsonAsync<Item[]>($"{_navigationManager.BaseUri}fake-data.json");
+                await _localStorage.SetItemAsync("data", originalData);
+            }
+
+            return (await _localStorage.GetItemAsync<Item[]>("data")).Skip((currentPage - 1) * pageSize).Take(pageSize).ToList();
+        }
+
+        public async Task<Item> GetById(int id)
+        {
+            // Get the current data
+            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
+
+            // Get the item int the list
+            var item = currentData.FirstOrDefault(w => w.Id == id);
+
+            // Check if item exist
+            if (item == null)
+            {
+                throw new Exception($"Unable to found the item with ID: {id}");
+            }
+
+            return item;
+        }
+
+        public async Task Update(int id, ItemModel model)
+        {
+            // Get the current data
+            var currentData = await _localStorage.GetItemAsync<List<Item>>("data");
+
+            // Get the item int the list
+            var item = currentData.FirstOrDefault(w => w.Id == id);
+
+            // Check if item exist
+            if (item == null)
+            {
+                throw new Exception($"Unable to found the item with ID: {id}");
+            }
+
+            // Save the image
+            var imagePathInfo = new DirectoryInfo($"{_webHostEnvironment.WebRootPath}/images");
+
+            // Check if the folder "images" exist
+            if (!imagePathInfo.Exists)
+            {
+                imagePathInfo.Create();
+            }
+
+            // Delete the previous image
+            if (item.Name != model.Name)
+            {
+                var oldFileName = new FileInfo($"{imagePathInfo}/{item.Name}.png");
+
+                if (oldFileName.Exists)
+                {
+                    File.Delete(oldFileName.FullName);
+                }
+            }
+
+            // Determine the image name
+            var fileName = new FileInfo($"{imagePathInfo}/{model.Name}.png");
+
+            // Write the file content
+            await File.WriteAllBytesAsync(fileName.FullName, model.ImageContent);
+
+            // Modify the content of the item
+            item.DisplayName = model.DisplayName;
+            item.Name = model.Name;
+            item.RepairWith = model.RepairWith;
+            item.EnchantCategories = model.EnchantCategories;
+            item.MaxDurability = model.MaxDurability;
+            item.StackSize = model.StackSize;
+            item.UpdatedDate = DateTime.Now;
+
+            // Save the data
+            await _localStorage.SetItemAsync("data", currentData);
+        }
+    }
+}
+
diff --git a/BlazorApp/BlazorApp/Services/IDataService.cs b/BlazorApp/BlazorApp/Services/IDataService.cs
new file mode 100644
index 0000000..bfbdd1e
--- /dev/null
+++ b/BlazorApp/BlazorApp/Services/IDataService.cs
@@ -0,0 +1,15 @@
+using System;
+using BlazorApp.Models;
+
+namespace BlazorApp.Services
+{
+    public interface IDataService
+    {
+        Task Add(ItemModel model);
+
+        Task<int> Count();
+
+        Task<List<Item>> List(int currentPage, int pageSize);
+    }
+}
+
diff --git a/BlazorApp/BlazorApp/wwwroot/images/test.png b/BlazorApp/BlazorApp/wwwroot/images/test.png
new file mode 100644
index 0000000..fc93a91
Binary files /dev/null and b/BlazorApp/BlazorApp/wwwroot/images/test.png differ