diff --git a/todo/src/main/java/ru/kamask/pet/todo/TodoApp.java b/todo/src/main/java/ru/kamask/pet/todo/TodoApp.java
index 232ccbb..8bbd7c2 100644
--- a/todo/src/main/java/ru/kamask/pet/todo/TodoApp.java
+++ b/todo/src/main/java/ru/kamask/pet/todo/TodoApp.java
@@ -3,12 +3,13 @@ package ru.kamask.pet.todo;
 import java.io.IOException;
 
 import ru.kamask.pet.todo.cli.CliEngine;
-import ru.kamask.pet.todo.repo.InMemoryTaskRepository;
+import ru.kamask.pet.todo.model.SimpleTask;
+import ru.kamask.pet.todo.repo.InMemoryRepository;
 import ru.kamask.pet.todo.service.TaskService;
 
 public class TodoApp {
     public static void main(String[] args) throws IOException {
-        var service = new TaskService(new InMemoryTaskRepository());
+        var service = new TaskService(new InMemoryRepository<SimpleTask>());
         var cli = new CliEngine(service);
 
         cli.start();
diff --git a/todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryTaskRepository.java b/todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryRepository.java
similarity index 59%
rename from todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryTaskRepository.java
rename to todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryRepository.java
index 7d3312e..fab4543 100644
--- a/todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryTaskRepository.java
+++ b/todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryRepository.java
@@ -6,23 +6,23 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import ru.kamask.pet.todo.model.SimpleTask;
+import ru.kamask.pet.todo.model.Identifiable;
 
-public class InMemoryTaskRepository implements TaskRepository {
-    private Map<Integer, SimpleTask> storage = new HashMap<>();
+public class InMemoryRepository<T extends Identifiable> implements Repository<T> {
+    private Map<Integer, T> storage = new HashMap<>();
 
     @Override
-    public void save(SimpleTask task) {
-        storage.put(task.id(), task);
+    public void save(T obj) {
+        storage.put(obj.getId(), obj);
     }
 
     @Override
-    public Optional<SimpleTask> findById(int id) {
+    public Optional<T> findById(int id) {
         return Optional.ofNullable(storage.get(id));
     }
 
     @Override
-    public List<SimpleTask> findAll() {
+    public List<T> findAll() {
         return new ArrayList<>(storage.values());
     }
 
diff --git a/todo/src/main/java/ru/kamask/pet/todo/repo/TaskRepository.java b/todo/src/main/java/ru/kamask/pet/todo/repo/TaskRepository.java
deleted file mode 100644
index 4d32d3d..0000000
--- a/todo/src/main/java/ru/kamask/pet/todo/repo/TaskRepository.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package ru.kamask.pet.todo.repo;
-
-import ru.kamask.pet.todo.model.SimpleTask;
-
-public interface TaskRepository extends Repository<SimpleTask> {}
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 0e7e932..7959efb 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
@@ -4,12 +4,12 @@ import java.util.List;
 import java.util.Optional;
 
 import ru.kamask.pet.todo.model.SimpleTask;
-import ru.kamask.pet.todo.repo.TaskRepository;
+import ru.kamask.pet.todo.repo.InMemoryRepository;
 
 public class TaskService {
-    private final TaskRepository repo;
+    private final InMemoryRepository<SimpleTask> repo;
 
-    public TaskService(TaskRepository repo) {
+    public TaskService(InMemoryRepository<SimpleTask> repo) {
         this.repo = repo;
     }