diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/ParameterName.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/ParameterName.java
index 49179780..906fa306 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/ParameterName.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/ParameterName.java
@@ -4,19 +4,21 @@ package fr.neatmonster.nocheatplus.actions;
  * Some wildcards that are used in commands and log messages.
  */
 public enum ParameterName {
-    BLOCK_ID("blockid"),
+	// TODO: Cleanup for some kind of policies: useful names, alternative names, prefer generic names.
+    BLOCK_ID("blockid"), // TODO: Block name ?
     CHECK("check"),
     TAGS("tags"),
     DISTANCE("distance"),
-    FALL_DISTANCE("falldistance"),
+    FALL_DISTANCE("falldistance"), // TODO: rather not deprecate ?
     FOOD("food"),
     IP("ip"),
     LIMIT("limit"),
     LOCATION_FROM("locationfrom"),
     LOCATION_TO("locationto"),
     PACKETS("packets"),
-    PLAYER("player"),
-    REACH_DISTANCE("reachdistance"),
+    PLAYER("player"), // TODO: playername rather ? + displayname ?
+    REACH_DISTANCE("reachdistance"), // TODO: deprecate ?
+    UUID("uuid"),
     VIOLATIONS("violations"),
     WORLD("world");
 
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/ViolationData.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/ViolationData.java
index 04e51db7..d1c818cd 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/ViolationData.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/ViolationData.java
@@ -135,6 +135,8 @@ public class ViolationData implements IViolationInfo, ActionData{
 			return player.getName();
 		case VIOLATIONS:
 			return String.valueOf((long) Math.round(vL));
+		case UUID:
+			return player.getUniqueId().toString();
 		default:
 			break;
 		}