diff --git a/src/main/java/de/ids_mannheim/korap/KorapQuery.java b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
index 25b7ec9..5944f29 100644
--- a/src/main/java/de/ids_mannheim/korap/KorapQuery.java
+++ b/src/main/java/de/ids_mannheim/korap/KorapQuery.java
@@ -168,6 +168,7 @@
 		    flag
 		);
 
+	    // TODO: This is DEPRECATED and should be communicated that way
 	    case "operation:submatch":
 		int number = 0;
 
@@ -188,6 +189,26 @@
 		    this.fromJSON(operands.get(0)), number
                 );
 
+	    case "operation:focus":
+		number = 0;
+
+		if (operands.size() != 1)
+		    throw new QueryException("Operation needs exactly two operands");
+
+		if (json.has("classRef")) {
+		    if (json.has("classRefOp"))
+			throw new QueryException("Class reference operators not supported yet");
+
+		    number = json.get("classRef").get(0).asInt();
+		}
+		else if (json.has("spanRef")) {
+		    throw new QueryException("Span references not supported yet");
+		};
+
+		return new SpanMatchModifyQueryWrapper(
+		    this.fromJSON(operands.get(0)), number
+                );
+
 	    case "operation:sequence":
 		if (operands.size() < 2)
 		    throw new QueryException(