diff --git a/src/main/java/com/example/demo/domain/Task.java b/src/main/java/com/example/demo/domain/Task.java
index 6f132fd30130b38157101250312c696bd08d3ca7..23bf2d225c6aa9b2ff20b80e9674a56ba45ba22f 100644
--- a/src/main/java/com/example/demo/domain/Task.java
+++ b/src/main/java/com/example/demo/domain/Task.java
@@ -19,7 +19,7 @@ public class Task {
     private String content;
     private String flag;
     private String solution;
-    private Long incorrectFlagLimit;
+    private int incorrectFlagLimit;
 
     @Column(name = "order_in_training_phase", nullable = false)
     private Integer order;
@@ -75,11 +75,11 @@ public class Task {
         this.solution = solution;
     }
 
-    public Long getIncorrectFlagLimit() {
+    public int getIncorrectFlagLimit() {
         return incorrectFlagLimit;
     }
 
-    public void setIncorrectFlagLimit(Long incorrectFlagLimit) {
+    public void setIncorrectFlagLimit(int incorrectFlagLimit) {
         this.incorrectFlagLimit = incorrectFlagLimit;
     }
 
diff --git a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java b/src/main/java/com/example/demo/dto/PhaseCreateDTO.java
index 7c4b286e390c40828fdc13703d96ead04f181a7c..13330b24622261e387d319743677089999537258 100644
--- a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java
+++ b/src/main/java/com/example/demo/dto/PhaseCreateDTO.java
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
 
 public class PhaseCreateDTO {
 
-    @ApiModelProperty(value = "Type of phase.", required = true, allowableValues = "QUESTIONNAIRE, INFO, GAME", example = "GAME")
+    @ApiModelProperty(value = "Type of phase.", required = true, allowableValues = "QUESTIONNAIRE_ADAPTIVE, QUESTIONNAIRE_GENERAL, INFO, GAME", example = "TRAINING")
     @NotNull(message = "Phase type must be specified")
     private PhaseType phaseType;
 
diff --git a/src/main/java/com/example/demo/dto/TaskDto.java b/src/main/java/com/example/demo/dto/TaskDto.java
index 4277d4f3a82690457cb6f3059eba2eac1d5deeb6..863bdf3062b6a9cc6e5a105c764bf16c82d615dd 100644
--- a/src/main/java/com/example/demo/dto/TaskDto.java
+++ b/src/main/java/com/example/demo/dto/TaskDto.java
@@ -10,7 +10,7 @@ public class TaskDto implements Serializable {
     private String content;
     private String flag;
     private String solution;
-    private Long incorrectFlagLimit;
+    private int incorrectFlagLimit;
 
     public Long getId() {
         return id;
@@ -60,11 +60,11 @@ public class TaskDto implements Serializable {
         this.solution = solution;
     }
 
-    public Long getIncorrectFlagLimit() {
+    public int getIncorrectFlagLimit() {
         return incorrectFlagLimit;
     }
 
-    public void setIncorrectFlagLimit(Long incorrectFlagLimit) {
+    public void setIncorrectFlagLimit(int incorrectFlagLimit) {
         this.incorrectFlagLimit = incorrectFlagLimit;
     }
 
diff --git a/src/main/java/com/example/demo/service/TaskService.java b/src/main/java/com/example/demo/service/TaskService.java
index 2d87bcb823939ca8686cc16fd7faa15e4e6278df..63c34c5ee4115cd3f5906a0ff6bb3c3736fb7663 100644
--- a/src/main/java/com/example/demo/service/TaskService.java
+++ b/src/main/java/com/example/demo/service/TaskService.java
@@ -41,9 +41,12 @@ public class TaskService {
         // TODO add check to trainingDefinitionId (field structure will be probably changed)
 
         Task task = new Task();
-        task.setTitle("Title of task");
+        task.setTitle("Title of a new task");
         task.setTrainingPhase(trainingPhase);
         task.setOrder(taskRepository.getCurrentMaxOrder(phaseId) + 1);
+        task.setFlag("Secret flag");
+        task.setContent("Task content ...");
+        task.setSolution("Task solution ...");
 
         Task persistedEntity = taskRepository.save(task);