diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/EmailConfig.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/EmailConfig.java
index 019015ea42c9fc86ef3b26b55863c0eb37a4bc59..e0ec885a138d33632344071c38c2f85dde75f3cf 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/EmailConfig.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/EmailConfig.java
@@ -6,8 +6,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 
-import java.util.Properties;
-
 @Configuration
 public class EmailConfig {
 
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/RabbitConfig.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/RabbitConfig.java
index 61e5763f195ca8a3559fb09e870e6625b6c583ff..eabcb695c836cdba992a58a718e8f303d126588c 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/RabbitConfig.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/config/RabbitConfig.java
@@ -7,7 +7,6 @@ import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 
 @Configuration
 public class RabbitConfig {
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstorming.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstorming.java
index a3d5a26b22fc6702bb412b0d4ba4b3e483813841..a0fddd85b2d75a00c9d9d483791b783c19ad1b21 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstorming.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstorming.java
@@ -1,8 +1,6 @@
 package de.thm.arsnova.frag.jetzt.backend.model.command;
 
-import java.io.Serializable;
-
-public class CreateBrainstorming extends WebSocketCommand<CreateBrainstormingPayload> implements Serializable {
+public class CreateBrainstorming extends WebSocketCommand<CreateBrainstormingPayload> {
 
     public CreateBrainstorming(){
         super(CreateBrainstorming.class.getSimpleName());
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstormingVote.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstormingVote.java
index 77797c25179237e4fd25e08a3557ebdb4f937909..a4619bb0a99e6e9ba7eb641ec25dfdb2fe8f1318 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstormingVote.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateBrainstormingVote.java
@@ -1,8 +1,6 @@
 package de.thm.arsnova.frag.jetzt.backend.model.command;
 
-import java.io.Serializable;
-
-public class CreateBrainstormingVote extends WebSocketCommand<CreateBrainstormingVotePayload> implements Serializable {
+public class CreateBrainstormingVote extends WebSocketCommand<CreateBrainstormingVotePayload> {
 
     public CreateBrainstormingVote() {
         super(CreateBrainstormingVote.class.getSimpleName());
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateComment.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateComment.java
index 78b7307aedc21452e112be3b2e410b62527c68d7..6ea093b5946bb3807585e55f77453436f474885e 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateComment.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/CreateComment.java
@@ -1,8 +1,6 @@
 package de.thm.arsnova.frag.jetzt.backend.model.command;
 
-import java.io.Serializable;
-
-public class CreateComment extends WebSocketCommand<CreateCommentPayload> implements Serializable {
+public class CreateComment extends WebSocketCommand<CreateCommentPayload> {
     public CreateComment() {
         super(CreateComment.class.getSimpleName());
     }
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstorming.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstorming.java
index 2b8f069682f2a0a6d995459f4750bf3e33f471c0..28ab663118f995300e78e26c325b04ecec933e6c 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstorming.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstorming.java
@@ -1,8 +1,6 @@
 package de.thm.arsnova.frag.jetzt.backend.model.command;
 
-import java.io.Serializable;
-
-public class DeleteBrainstorming extends WebSocketCommand<DeleteBrainstormingPayload> implements Serializable {
+public class DeleteBrainstorming extends WebSocketCommand<DeleteBrainstormingPayload> {
 
     public DeleteBrainstorming() {
         super(DeleteBrainstorming.class.getSimpleName());
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstormingVote.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstormingVote.java
index a398fe69ef3a3d5c119ce98d8cd30282ebe3e682..392b507a7925253862d929d08b9a2bcc387c74f1 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstormingVote.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteBrainstormingVote.java
@@ -1,8 +1,6 @@
 package de.thm.arsnova.frag.jetzt.backend.model.command;
 
-import java.io.Serializable;
-
-public class DeleteBrainstormingVote extends WebSocketCommand<DeleteBrainstormingVotePayload> implements Serializable {
+public class DeleteBrainstormingVote extends WebSocketCommand<DeleteBrainstormingVotePayload> {
 
     public DeleteBrainstormingVote() {
         super(DeleteBrainstormingVote.class.getSimpleName());
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteCommentsByRoomPayload.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteCommentsByRoomPayload.java
index 98d21e0f1273cf30d039c3690d585a28d2b6fc3e..45a373b926e6501f946a125ce96411571ac052e3 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteCommentsByRoomPayload.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/DeleteCommentsByRoomPayload.java
@@ -18,8 +18,8 @@ public class DeleteCommentsByRoomPayload implements WebSocketPayload {
         return roomId;
     }
 
-    public void setRoomId(String id) {
-        this.roomId = roomId;
+    public void setRoomId(UUID id) {
+        this.roomId = id;
     }
 
     @Override
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/ImportComments.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/ImportComments.java
index af6772db35e58d8092be75aa426782fb7994360c..37aa07266686ca3412c286f867d54aee24de8cfb 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/ImportComments.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/ImportComments.java
@@ -1,8 +1,6 @@
 package de.thm.arsnova.frag.jetzt.backend.model.command;
 
-import java.io.Serializable;
-
-public class ImportComments extends WebSocketCommand<ImportCommentsPayload> implements Serializable {
+public class ImportComments extends WebSocketCommand<ImportCommentsPayload> {
 
     public ImportComments() {
         super(ImportComments.class.getSimpleName());
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/UpdateBrainstormingCategoriesPayload.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/UpdateBrainstormingCategoriesPayload.java
index 91b6dfd2591db50b12800de2b1ab67f36d5449b0..82f80711c05774e1ecbe301f01088a81c2d87385 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/UpdateBrainstormingCategoriesPayload.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/command/UpdateBrainstormingCategoriesPayload.java
@@ -1,7 +1,6 @@
 package de.thm.arsnova.frag.jetzt.backend.model.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import de.thm.arsnova.frag.jetzt.backend.model.BrainstormingCategory;
 import de.thm.arsnova.frag.jetzt.backend.model.WebSocketPayload;
 
 import java.util.List;
diff --git a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/event/BrainstormingWordCreatedPayload.java b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/event/BrainstormingWordCreatedPayload.java
index f2f3cdd3ddc6e3e8eb08a14571e7776ec44a5890..8e6345f238ad717cf39df7d0f1622c458a587c1f 100644
--- a/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/event/BrainstormingWordCreatedPayload.java
+++ b/src/main/java/de/thm/arsnova/frag/jetzt/backend/model/event/BrainstormingWordCreatedPayload.java
@@ -11,15 +11,17 @@ public class BrainstormingWordCreatedPayload implements WebSocketPayload {
     private UUID id;
     private UUID sessionId;
     private String name;
+    private String correctedWord;
 
-    public BrainstormingWordCreatedPayload(){
+    public BrainstormingWordCreatedPayload() {
 
     }
 
-    public BrainstormingWordCreatedPayload(BrainstormingWord word){
+    public BrainstormingWordCreatedPayload(BrainstormingWord word) {
         this.id = word.getId();
         this.sessionId = word.getSessionId();
         this.name = word.getWord();
+        this.correctedWord = word.getCorrectedWord();
     }
 
     public UUID getId() {
@@ -46,25 +48,39 @@ public class BrainstormingWordCreatedPayload implements WebSocketPayload {
         this.name = name;
     }
 
+    public String getCorrectedWord() {
+        return correctedWord;
+    }
+
+    public void setCorrectedWord(String correctedWord) {
+        this.correctedWord = correctedWord;
+    }
+
     @Override
     public String toString() {
         return "BrainstormingWordCreatedPayload{" +
                 "id=" + id +
                 ", sessionId=" + sessionId +
                 ", name='" + name + '\'' +
+                ", correctedWord='" + correctedWord + '\'' +
                 '}';
     }
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         BrainstormingWordCreatedPayload that = (BrainstormingWordCreatedPayload) o;
-        return Objects.equals(id, that.id) && Objects.equals(sessionId, that.sessionId) && Objects.equals(name, that.name);
+        return Objects.equals(id, that.id) &&
+                Objects.equals(sessionId, that.sessionId) &&
+                Objects.equals(name, that.name) &&
+                Objects.equals(correctedWord, that.correctedWord);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, sessionId, name);
+        return Objects.hash(id, sessionId, name, correctedWord);
     }
 }