diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java
index c1914c4c96afd0e153dd7a78ea306f2c019d9154..9f05f251268c3b3b84164d87a6cdf23d494f3659 100644
--- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java
+++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDao.java
@@ -1,19 +1,13 @@
 package cz.fi.muni.pa165.seminar4.group7.secretservice.dao;
 
+import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.AgentAssignment;
 import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.Report;
+import org.springframework.data.repository.CrudRepository;
 
 import java.util.List;
 
 /**
  * @author Jan Smejkal
  */
-public interface ReportDao {
-
-    void create(Report report);
-
-    List<Report> findAll();
-
-    Report findById(long id);
-
-    void remove(Report report);
+public interface ReportDao  extends CrudRepository<Report, Long> {
 }
diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDaoImpl.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDaoImpl.java
deleted file mode 100644
index f583c47c101ccc58bb2c8aee9b6a6386bc4bc144..0000000000000000000000000000000000000000
--- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/ReportDaoImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cz.fi.muni.pa165.seminar4.group7.secretservice.dao;
-
-import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.Report;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-
-/**
- * @author Jan Smejkal
- */
-@Repository
-public class ReportDaoImpl implements ReportDao {
-
-    @PersistenceContext
-    private EntityManager em;
-
-    public ReportDaoImpl(EntityManager em) {
-        this.em = em;
-    }
-
-    @Override
-    public void create(Report report) {
-        em.persist(report);
-    }
-
-    @Override
-    public List<Report> findAll() {
-        return em.createQuery("select r from Report r", Report.class).getResultList();
-    }
-
-    @Override
-    public Report findById(long id) {
-        return em.find(Report.class, id);
-    }
-
-    @Override
-    public void remove(Report report) {
-        em.remove(report);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java
index da20408f837169a1b2d66deeff78467fdf9816c6..ec49758aea137d14e1b6aa37d5f0753e9d4d92ae 100644
--- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java
+++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/PerformanceEvaluation.java
@@ -2,6 +2,7 @@ package cz.fi.muni.pa165.seminar4.group7.secretservice.entity;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import javax.persistence.*;
 
@@ -13,6 +14,7 @@ import javax.persistence.*;
 @Entity
 @Getter
 @Setter
+@Accessors(chain = true)
 public class PerformanceEvaluation {
     @Id
     @Column(name = "id", nullable = false)
diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java
index e96c3424108a621dfd50ea15afdb5517ffe60357..1662e8d4261138a7c878f938ece14c4194f3d9c5 100644
--- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java
+++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Report.java
@@ -2,6 +2,7 @@ package cz.fi.muni.pa165.seminar4.group7.secretservice.entity;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import javax.persistence.*;
 
@@ -13,13 +14,13 @@ import javax.persistence.*;
 @Entity
 @Getter
 @Setter
+@Accessors(chain = true)
 public class Report {
     @Id
     @Column(name = "id", nullable = false)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-
     private String report;
 
     @OneToOne(mappedBy = "report")