diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java
index 22114133463c01ad756d28901c5231104765bb0a..094c88df95e860744c2764df2e87820823ca155d 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandBodyMapper.java
@@ -86,21 +86,10 @@ public interface CommandBodyMapper {
 	}
 
 	default Map<String, Object> fromObjectToMap(Object object) {
-		var objectMap = new HashMap<String, Object>();
-
-		new BeanMap(object).entrySet().forEach(entry -> {
-			var keyString = entry.getKey().toString();
-
-			if (shouldMap(keyString)) {
-				objectMap.put(keyString, checkEnumValue(entry.getValue()));
-			}
-		});
-
-		return objectMap;
-	}
-
-	private boolean shouldMap(String key) {
-		return !key.equals("class") && !key.equals("version");
+		return new BeanMap(object).entrySet().stream()
+				.filter(IS_NOT_CLASS_VALUE)
+				.filter(IS_NOT_VERSION_VALUE)
+				.collect(HashMap::new, (map, entry) -> map.put(entry.getKey().toString(), checkEnumValue(entry.getValue())), Map::putAll);
 	}
 
 	private Object checkEnumValue(Object entryValue) {