diff --git a/pom.xml b/pom.xml
index 0225b3bd5b6b0767489603cbc8b6e3b2020e3b1e..c0fd60edb1b95a4153797fea0ef83d0e1fb3fbd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,14 +17,20 @@
 		<java.version>17</java.version>
 	</properties>
 	<dependencies>
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.boot</groupId>-->
-<!--			<artifactId>spring-boot-starter-data-jpa</artifactId>-->
-<!--		</dependency>-->
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.boot</groupId>-->
-<!--			<artifactId>spring-boot-starter-web</artifactId>-->
-<!--		</dependency>-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+		        <groupId>org.projectlombok</groupId>
+		        <artifactId>lombok</artifactId>
+		        <version>1.18.20</version>
+		        <scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/example/livecodingjavaspring/App.java b/src/main/java/com/example/livecodingjavaspring/App.java
index 4920daa6e27d7263344fa162639da5c72e90df69..387190c0716c037e93af3eafd2526ea3aab5f677 100644
--- a/src/main/java/com/example/livecodingjavaspring/App.java
+++ b/src/main/java/com/example/livecodingjavaspring/App.java
@@ -1,13 +1,13 @@
 package com.example.livecodingjavaspring;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 
+@SpringBootApplication(exclude={ DataSourceAutoConfiguration.class })
 public class App {
     public static void main(String[] args) {
-        UserDao userDao = new UserDao();
-        List<User> users= userDao.createDatabase();
-        Cli cli = new Cli(users);
-        cli.run();
+        new SpringApplicationBuilder(App.class).web(WebApplicationType.NONE).run(args);
     }
 }
diff --git a/src/main/java/com/example/livecodingjavaspring/Cli.java b/src/main/java/com/example/livecodingjavaspring/Cli.java
index 82c0d63eb4918be94d959a78fa1ca43a2b18f36c..4e6e4ea0ae67bb8881d59b6ed26d6260c2ff35e0 100644
--- a/src/main/java/com/example/livecodingjavaspring/Cli.java
+++ b/src/main/java/com/example/livecodingjavaspring/Cli.java
@@ -1,16 +1,20 @@
 package com.example.livecodingjavaspring;
 
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
 import java.util.List;
 import java.util.Scanner;
-
-public class Cli {
-    private final List<User> users;
-
-    public Cli(List<User> users) {
-        this.users = users;
-    }
-
-    public void run() {
+@Component
+@RequiredArgsConstructor
+public class Cli implements CommandLineRunner {
+    private List<User> users;
+    private final UserDao userDao;
+
+    @Override
+    public void run(String... args) {
+        users = userDao.createDatabase();
         int choice = -1;
         while (choice != 0) {
             Scanner scanner = new Scanner(System.in);
diff --git a/src/main/java/com/example/livecodingjavaspring/UserDao.java b/src/main/java/com/example/livecodingjavaspring/UserDao.java
index c5f3891d128bcf2912b5b85d649b572866696ea8..6a24db22ead70e123473f71d831c5beabc0a4b30 100644
--- a/src/main/java/com/example/livecodingjavaspring/UserDao.java
+++ b/src/main/java/com/example/livecodingjavaspring/UserDao.java
@@ -1,8 +1,10 @@
 package com.example.livecodingjavaspring;
 
+import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.List;
-
+@Service
 public class UserDao {
 
     public List<User> createDatabase() {