diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/PageResultResource.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/PageResultResource.java
index 9164527546f19b5b176edf3c7a2f73cc43103dde..2349611d9dc14055346cfbfe06c6c8299e6a81fd 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/PageResultResource.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/PageResultResource.java
@@ -11,7 +11,7 @@ import java.util.List;
  * This class is used to replace Page class and reduce the number of returned elements (standard Page class contains
  * fields, which are not useful (backward compatibility)).
  *
- * @author Pavel Šeda (441048)
+ * @author Pavel Šeda
  */
 @ApiModel(value = "Result info (Page)",
         description = "Content (Retrieved data) and meta information about REST API result page. Including page number, number of elements in page, size of elements, total number of elements and total number of pages")
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/GroupDeletionStatusDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/GroupDeletionStatusDTO.java
index ddd1f60ae1c166b0fe0d3636efa776dc4b3b0b0c..d6af06658d0005c0fc9117fb778a2a6e8b2ee9b4 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/GroupDeletionStatusDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/GroupDeletionStatusDTO.java
@@ -1,5 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.enums;
 
+import io.swagger.annotations.ApiModel;
+
 /**
  * Enumeration of group deletion statuses.
  *
@@ -7,6 +9,8 @@ package cz.muni.ics.kypo.userandgroup.api.dto.enums;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "GroupDeletionStatusDTO",
+        description = "The statuses that are used in a group deletion.")
 public enum GroupDeletionStatusDTO {
     /**
      * The group is external valid and cannot be deleted.
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/RoleTypeDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/RoleTypeDTO.java
index 7639d15947a889b920a5dd98b7cc0f0e3ce952c8..4d0f0b60fbaf62756aeb396f1f84b2b5a07237cc 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/RoleTypeDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/RoleTypeDTO.java
@@ -1,10 +1,14 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.enums;
 
+import io.swagger.annotations.ApiModel;
+
 /**
  * Enumeration of role types.
  *
  * @author Pavel Seda
  */
+@ApiModel(value = "RoleTypeDTO",
+        description = "The types of a default roles.")
 public enum RoleTypeDTO {
     /**
      * The role of administrator.
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/Source.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/Source.java
index 7aa6c0490f956d38081676d0df057787c5f3ef92..59e652eee998e9f5c00d18ad3287b09272ad2d9e 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/Source.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/Source.java
@@ -1,9 +1,13 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.enums;
 
+import io.swagger.annotations.ApiModel;
+
 /**
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "Source",
+        description = "The source.")
 public enum Source {
 
     INTERNAL("Internal"),
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/SpringProfiles.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/SpringProfiles.java
index 62f779304b7048dfc863832ffe9260355dba5b6f..0799f89f92a01fd8f922cfe0dc23f4cef747b4fd 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/SpringProfiles.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/SpringProfiles.java
@@ -1,6 +1,19 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.enums;
 
-public enum SpringProfiles {
+import io.swagger.annotations.ApiModel;
 
-    PROD, DEV
+/**
+ * @author Pavel Seda
+ */
+@ApiModel(value = "SpringProfiles",
+        description = "The environment profiles.")
+public enum SpringProfiles {
+    /**
+     * The PROD profile.
+     */
+    PROD,
+    /**
+     * The DEV profile.
+     */
+    DEV;
 }
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserAndGroupStatusDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserAndGroupStatusDTO.java
index 0c82244c6bdbafb5b4929e936c02cc55388560f3..d0883aa41753355d511012ae056cad1a06090613 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserAndGroupStatusDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserAndGroupStatusDTO.java
@@ -1,9 +1,13 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.enums;
 
+import io.swagger.annotations.ApiModel;
+
 /**
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "UserAndGroupStatusDTO",
+        description = "The user and group status.")
 public enum UserAndGroupStatusDTO {
     VALID, DELETED, DIRTY;
 }
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserDeletionStatusDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserDeletionStatusDTO.java
index d35f389b114233761519c29479f046f45dd83a27..504eaa653adfc8dad703fd9feae3296a1b9bddf7 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserDeletionStatusDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/enums/UserDeletionStatusDTO.java
@@ -1,5 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.enums;
 
+import io.swagger.annotations.ApiModel;
+
 /**
  * Enumeration of user deletion statuses.
  *
@@ -7,6 +9,8 @@ package cz.muni.ics.kypo.userandgroup.api.dto.enums;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "UserDeletionStatusDTO",
+        description = "The user and deletion status.")
 public enum UserDeletionStatusDTO {
     /**
      * User was successfully deleted.
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/AddUsersToGroupDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/AddUsersToGroupDTO.java
index 134dd19ccc30e577b712a34e55e3070dd6de3c91..f6cdb7999c810a485bef4ee3121325efc7d20c0d 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/AddUsersToGroupDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/AddUsersToGroupDTO.java
@@ -1,5 +1,6 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.group;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.ArrayList;
@@ -12,6 +13,8 @@ import java.util.Objects;
  * @author Jan Duda
  * @author Pavel Seda
  */
+@ApiModel(value = "AddUsersToGroupDTO",
+        description = "Data that need to be provided to add users to a group.")
 public class AddUsersToGroupDTO {
 
     @ApiModelProperty(value = "Main identifiers of users to be added to group.", example = "[1,2]")
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDTO.java
index f56dc963901677bc3f83c6e0bf953cefd347e80b..bb649f6465d1b06052147324b5b000b8b88ca3c7 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDTO.java
@@ -5,6 +5,7 @@ import cz.muni.ics.kypo.userandgroup.api.dto.enums.Source;
 import cz.muni.ics.kypo.userandgroup.api.dto.enums.UserAndGroupStatusDTO;
 import cz.muni.ics.kypo.userandgroup.api.dto.role.RoleDTO;
 import cz.muni.ics.kypo.userandgroup.api.dto.user.UserForGroupsDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
@@ -17,6 +18,8 @@ import java.util.*;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "GroupDTO",
+        description = "The detailed information about a group.")
 public class GroupDTO {
 
     @ApiModelProperty(value = "Main identifier of group.", example = "1", position = 1)
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDeletionResponseDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDeletionResponseDTO.java
index 3d11323a23018c8ec26927aaa59c62335e97bed4..816c2dadef43605b40b7325c19fd498ec972e459 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDeletionResponseDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/GroupDeletionResponseDTO.java
@@ -1,6 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.group;
 
 import cz.muni.ics.kypo.userandgroup.api.dto.enums.GroupDeletionStatusDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Objects;
@@ -11,6 +12,8 @@ import java.util.Objects;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "GroupDeletionResponseDTO",
+        description = "The information provided immediately to the client after the client deletes a given group.")
 public class GroupDeletionResponseDTO {
 
     @ApiModelProperty(value = "Main identifiers of deleted group.", example = "1", position = 1)
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/NewGroupDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/NewGroupDTO.java
index 04cab5242fdec1e8c7e12d9761bbed9977b424ff..0050b5efc0aa3ec94fd01fe87546cb254a7782f1 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/NewGroupDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/NewGroupDTO.java
@@ -2,6 +2,7 @@ package cz.muni.ics.kypo.userandgroup.api.dto.group;
 
 import cz.muni.ics.kypo.userandgroup.api.converters.LocalDateTimeUTCSerializer;
 import cz.muni.ics.kypo.userandgroup.api.dto.user.UserForGroupsDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
@@ -15,6 +16,8 @@ import java.util.*;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "NewGroupDTO",
+        description = "Data that need to be provided to create a new group.")
 public class NewGroupDTO {
 
     @ApiModelProperty(value = "A name of the group.", required = true, example = "Main group")
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/UpdateGroupDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/UpdateGroupDTO.java
index 0c5f6c71dbf7ccc94e7f399772115534fcb99b07..576756b7d798bd5458dc091f516653efdf9f1d64 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/UpdateGroupDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/group/UpdateGroupDTO.java
@@ -1,6 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.group;
 
 import cz.muni.ics.kypo.userandgroup.api.converters.LocalDateTimeUTCSerializer;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
@@ -15,6 +16,8 @@ import java.util.Objects;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "UpdateGroupDTO",
+        description = "Data that need to be provided to update particular group.")
 public class UpdateGroupDTO {
 
     @ApiModelProperty(value = "Main identifier of group.", required = true, example = "1", position = 1)
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/MicroserviceDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/MicroserviceDTO.java
index 9e952830baf73879975318d97df65d8452b0a9f1..8cc402a4c8af9d1129079364b3849fcd3920e62a 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/MicroserviceDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/MicroserviceDTO.java
@@ -1,5 +1,6 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.microservice;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Objects;
@@ -10,6 +11,8 @@ import java.util.Objects;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "MicroserviceDTO",
+        description = "Information about a microservice.")
 public class MicroserviceDTO {
 
     @ApiModelProperty(value = "Main identifier of the microservice.", example = "1", position = 1)
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/NewMicroserviceDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/NewMicroserviceDTO.java
index 25031a2bbd0815b373162c2452f6402caed578ce..9288a674c22c8d8c5cdf519d7bcfe801c8e0788d 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/NewMicroserviceDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/microservice/NewMicroserviceDTO.java
@@ -1,6 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.microservice;
 
 import cz.muni.ics.kypo.userandgroup.api.dto.role.RoleForNewMicroserviceDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.Valid;
@@ -15,6 +16,8 @@ import java.util.Set;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "NewMicroserviceDTO",
+        description = "Data that need to be provided to register a new microservice.")
 public class NewMicroserviceDTO {
 
     @ApiModelProperty(value = "A name of the microservice.", required = true, example = "kypo2-training")
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleDTO.java
index 61c718be30f9e41f341117bb4ecd014fa3c01082..1feb5a6c2c980271e6c5ce58259a1aa6a2c76bbc 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleDTO.java
@@ -1,6 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.role;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Objects;
@@ -11,6 +12,8 @@ import java.util.Objects;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "RoleDTO",
+        description = "The detailed information about role.")
 public class RoleDTO {
 
     @ApiModelProperty(value = "Main identifier of the role.", example = "1", position = 1)
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleForNewMicroserviceDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleForNewMicroserviceDTO.java
index 330cb73d4f0e41add6576c723eb1517544169c3e..f035853f16523962d28a9452090723c1361c4164 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleForNewMicroserviceDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/role/RoleForNewMicroserviceDTO.java
@@ -1,5 +1,6 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.role;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotEmpty;
@@ -12,6 +13,8 @@ import java.util.Objects;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "RoleForNewMicroserviceDTO",
+        description = "Data that need to be provided to register new role.")
 public class RoleForNewMicroserviceDTO {
 
     @ApiModelProperty(value = "Role type of role.", required = true, example = "ROLE_USER_AND_GROUP_ADMINISTRATOR")
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDTO.java
index 74a8eabae6fd50754f7b79b2ee965024deb5a640..5898652cf19cbb7032e9e3859e83bd0b16f1809a 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDTO.java
@@ -1,6 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.user;
 
 import cz.muni.ics.kypo.userandgroup.api.dto.role.RoleDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.HashSet;
@@ -12,6 +13,8 @@ import java.util.Set;
  *
  * @author Pavel Seda
  */
+@ApiModel(value = "UserDTO",
+        description = "Detailed information about user.")
 public class UserDTO {
 
     @ApiModelProperty(value = "Main identifier of the user.", example = "1", position = 1)
@@ -20,7 +23,7 @@ public class UserDTO {
     private String fullName;
     @ApiModelProperty(value = "Login of the user.", example = "pavelseda")
     private String login;
-    @ApiModelProperty(value = "Email of the user.", example = "pavelseda@mail.muni.cz.")
+    @ApiModelProperty(value = "Email of the user.", example = "pavelseda@mail.muni.cz")
     private String mail;
     @ApiModelProperty(value = "First name of a user.", example = "Pavel")
     private String givenName;
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDeletionResponseDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDeletionResponseDTO.java
index 252cd76edd83b96aed0959abc6a61713f3df10d6..984b604b266a541031ce7f0bc0c16ebff74643e7 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDeletionResponseDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserDeletionResponseDTO.java
@@ -1,6 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.user;
 
 import cz.muni.ics.kypo.userandgroup.api.dto.enums.UserDeletionStatusDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Objects;
@@ -11,6 +12,8 @@ import java.util.Objects;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "UserDeletionResponseDTO",
+        description = "The information provided immediately to the client after the client deletes a given user.")
 public class UserDeletionResponseDTO {
 
     @ApiModelProperty(value = "User to be deleted.")
diff --git a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserForGroupsDTO.java b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserForGroupsDTO.java
index 81d62fbbeff65010b0558d94cef21d1268129bbb..3673e684dd71dcf0cfc7af6cf11d6f9f1bf72a05 100644
--- a/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserForGroupsDTO.java
+++ b/kypo2-api-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/api/dto/user/UserForGroupsDTO.java
@@ -1,5 +1,6 @@
 package cz.muni.ics.kypo.userandgroup.api.dto.user;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Objects;
@@ -10,6 +11,8 @@ import java.util.Objects;
  * @author Pavel Seda
  * @author Dominik Pilar
  */
+@ApiModel(value = "User for Groups Dto.",
+        description = "Encapsulates information about a user used in a given groups.")
 public class UserForGroupsDTO {
 
     @ApiModelProperty(value = "Main identifiers of the user.", example = "1", position = 1)
@@ -22,7 +25,7 @@ public class UserForGroupsDTO {
     private String familyName;
     @ApiModelProperty(value = "Login of the user.", example = "{\"sub\":\"pavelseda\",  \"iss\": \"https://oidc.muni.cz/oidc/\"}")
     private String login;
-    @ApiModelProperty(value = "Email of the user.", example = "pavelseda@mail.muni.cz.")
+    @ApiModelProperty(value = "Email of the user.", example = "pavelseda@mail.muni.cz")
     private String mail;
     @ApiModelProperty(value = "Issuer of a user.", example = "https://oidc.muni.cz")
     private String iss;
diff --git a/kypo2-security-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/security/service/IdenticonService.java b/kypo2-security-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/security/service/IdenticonService.java
index 53a37e012753e8eacc9a9e09706e784d7c18d981..00fc9572fc17494666744d6e4a93655e855d908f 100644
--- a/kypo2-security-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/security/service/IdenticonService.java
+++ b/kypo2-security-user-and-group/src/main/java/cz/muni/ics/kypo/userandgroup/security/service/IdenticonService.java
@@ -1,10 +1,7 @@
 package cz.muni.ics.kypo.userandgroup.security.service;
 
-import cz.muni.ics.kypo.userandgroup.repository.IDMGroupRepository;
-import cz.muni.ics.kypo.userandgroup.repository.UserRepository;
 import cz.muni.ics.kypo.userandgroup.security.exception.IconGenerationException;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.imageio.ImageIO;