diff --git a/todo/src/main/java/ru/kamask/pet/todo/cli/ListCommand.java b/todo/src/main/java/ru/kamask/pet/todo/cli/ListCommand.java
index 2e60482..3a5de09 100644
--- a/todo/src/main/java/ru/kamask/pet/todo/cli/ListCommand.java
+++ b/todo/src/main/java/ru/kamask/pet/todo/cli/ListCommand.java
@@ -17,7 +17,7 @@ public class ListCommand implements Command {
         if (args.length > 0)
             return Optional.of(Command.errorMessage);
 
-        var res = formatWithTable(service.list(), "Список задач пуст.");
+        var res = formatWithTable(service.getAll(), "Список задач пуст.");
 
         return Optional.of(res);
     }
diff --git a/todo/src/main/java/ru/kamask/pet/todo/service/EntityService.java b/todo/src/main/java/ru/kamask/pet/todo/service/EntityService.java
index 9f0bc6d..720aa7f 100644
--- a/todo/src/main/java/ru/kamask/pet/todo/service/EntityService.java
+++ b/todo/src/main/java/ru/kamask/pet/todo/service/EntityService.java
@@ -13,23 +13,23 @@ public class EntityService<T extends Identifiable> {
         this.repo = repo;
     }
 
-    protected void save(T obj) {
+    public void save(T obj) {
         repo.save(obj);
     }
 
-    protected Optional<T> getById(int id) {
+    public Optional<T> getById(int id) {
         return repo.findById(id);
     }
 
-    protected List<T> getAll() {
+    public List<T> getAll() {
         return repo.findAll();
     }
 
-    protected void remove(int id) {
+    public void remove(int id) {
         repo.delete(id);
     }
 
-    protected boolean has(int id) {
+    public boolean has(int id) {
         return repo.has(id);
     }
 }
diff --git a/todo/src/main/java/ru/kamask/pet/todo/service/TaskService.java b/todo/src/main/java/ru/kamask/pet/todo/service/TaskService.java
index 7959efb..c1ab2ef 100644
--- a/todo/src/main/java/ru/kamask/pet/todo/service/TaskService.java
+++ b/todo/src/main/java/ru/kamask/pet/todo/service/TaskService.java
@@ -1,28 +1,23 @@
 package ru.kamask.pet.todo.service;
 
 import java.util.List;
-import java.util.Optional;
 
 import ru.kamask.pet.todo.model.SimpleTask;
-import ru.kamask.pet.todo.repo.InMemoryRepository;
+import ru.kamask.pet.todo.repo.Repository;
 
-public class TaskService {
-    private final InMemoryRepository<SimpleTask> repo;
+public class TaskService extends EntityService<SimpleTask> {
 
-    public TaskService(InMemoryRepository<SimpleTask> repo) {
-        this.repo = repo;
+    public TaskService(Repository<SimpleTask> repo) {
+        super(repo);
     }
 
     public void create(String title) {
-        repo.save(new SimpleTask(title));
+        super.save(new SimpleTask(title));
     }
 
-    public Optional<SimpleTask> getById(int id) {
-        return repo.findById(id);
-    }
 
     public boolean complete(int id) {
-        var taskOpt = repo.findById(id);
+        var taskOpt = super.getById(id);
         if (taskOpt.isPresent()) {
             taskOpt.get().markAsCompleted();
             return true;
@@ -30,20 +25,9 @@ public class TaskService {
         return false;
     }
 
-    public List<SimpleTask> list() {
-        return repo.findAll();
-    }
-
-    public void remove(int id) {
-        repo.delete(id);
-    }
-
-    public boolean has(int id) {
-        return repo.has(id);
-    }
 
     public List<SimpleTask> search(String query) {
-        return repo.findAll().stream()
+        return super.getAll().stream()
                 .filter(task -> task.data().title().contains(query))
                 .toList();
     }