diff --git a/release-packaging/Classes/FluidKDTree.sc b/release-packaging/Classes/FluidKDTree.sc
index c3fe972..2d22181 100644
--- a/release-packaging/Classes/FluidKDTree.sc
+++ b/release-packaging/Classes/FluidKDTree.sc
@@ -51,10 +51,12 @@ FluidKDTree : FluidRealTimeModel
         lookupDataSet = lookupDataSet ? -1;
         this.lookupDataSet_(lookupDataSet);
         this.lookupDataSet.asUGenInput.postln;
-        ^FluidProxyUgen.kr('FluidKDTree/query', K2A.ar(trig),
-                id, this.numNeighbours, this.radius, this.lookupDataSet.asUGenInput,
+        ^FluidKDTreeQuery.kr(K2A.ar(trig),
+                this, this.numNeighbours, this.radius, this.lookupDataSet.asUGenInput,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 
 }
+
+FluidKDTreeQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidKMeans.sc b/release-packaging/Classes/FluidKMeans.sc
index 892bd27..a38d613 100644
--- a/release-packaging/Classes/FluidKMeans.sc
+++ b/release-packaging/Classes/FluidKMeans.sc
@@ -60,9 +60,11 @@ FluidKMeans : FluidRealTimeModel {
 	}
 
     kr{|trig, inputBuffer,outputBuffer|
-        ^FluidProxyUgen.kr('FluidKMeans/query', K2A.ar(trig),
-                id, clusters, maxiter,
+        ^FluidKMeansQuery.kr(K2A.ar(trig),
+                this, clusters, maxiter,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 }
+
+FluidKMeansQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidKNNClassifier.sc b/release-packaging/Classes/FluidKNNClassifier.sc
index 014a0cc..0161bb1 100644
--- a/release-packaging/Classes/FluidKNNClassifier.sc
+++ b/release-packaging/Classes/FluidKNNClassifier.sc
@@ -38,10 +38,12 @@ FluidKNNClassifier : FluidRealTimeModel {
 	}
 
     kr{|trig, inputBuffer,outputBuffer|
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, this.numNeighbours, this.weight,
+        ^FluidKNNClassifierQuery.kr(K2A.ar(trig),
+                this, this.numNeighbours, this.weight,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 
 }
+
+FluidKNNClassifierQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidKNNRegressor.sc b/release-packaging/Classes/FluidKNNRegressor.sc
index a6a7cad..8c622a5 100644
--- a/release-packaging/Classes/FluidKNNRegressor.sc
+++ b/release-packaging/Classes/FluidKNNRegressor.sc
@@ -38,9 +38,11 @@ FluidKNNRegressor : FluidRealTimeModel {
 	}
 
     kr{|trig, inputBuffer,outputBuffer|
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, this.numNeighbours, this.weight,
+        ^FluidKNNRegressorQuery.kr(K2A.ar(trig),
+                this, this.numNeighbours, this.weight,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 }
+
+FluidKNNRegressorQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidMLP.sc b/release-packaging/Classes/FluidMLP.sc
index d459d1f..23e5624 100644
--- a/release-packaging/Classes/FluidMLP.sc
+++ b/release-packaging/Classes/FluidMLP.sc
@@ -75,12 +75,12 @@ FluidMLPRegressor : FluidRealTimeModel {
         params = this.prGetParams.drop(-2) ++ [this.prEncodeBuffer(inputBuffer),
         this.prEncodeBuffer(outputBuffer)];
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, *params);
+        ^FluidMLPRegressorQuery.kr(K2A.ar(trig),this, *params);
     }
 
 }
 
+FluidMLPRegressorQuery : FluidRTQuery {}
 
 FluidMLPClassifier : FluidRealTimeModel {
 
@@ -145,7 +145,8 @@ FluidMLPClassifier : FluidRealTimeModel {
         var params = this.prGetParams.drop(-2) ++  [this.prEncodeBuffer(inputBuffer),
         this.prEncodeBuffer(outputBuffer)];
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, *params);
+        ^FluidMLPClassifierQuery.kr(K2A.ar(trig),this, *params);
     }
 }
+
+FluidMLPClassifierQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidNormalize.sc b/release-packaging/Classes/FluidNormalize.sc
index 17d5c5a..94eb422 100644
--- a/release-packaging/Classes/FluidNormalize.sc
+++ b/release-packaging/Classes/FluidNormalize.sc
@@ -60,9 +60,11 @@ FluidNormalize : FluidRealTimeModel {
 
         this.min_(min).max_(max).invert_(invert);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, this.min, this.max, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
+        ^FluidNormalizeQuery.kr( K2A.ar(trig),
+                this, this.min, this.max, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer)); 
     }
 
 
 }
+
+FluidNormalizeQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidPCA.sc b/release-packaging/Classes/FluidPCA.sc
index 94c7df3..20190c5 100644
--- a/release-packaging/Classes/FluidPCA.sc
+++ b/release-packaging/Classes/FluidPCA.sc
@@ -55,8 +55,9 @@ FluidPCA : FluidRealTimeModel{
         numDimensions = numDimensions ? this.numDimensions;
         this.numDimensions_(numDimensions);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, this.numDimensions, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
+        ^FluidPCAQuery.kr(K2A.ar(trig),this, this.numDimensions, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
     }
 
 }
+
+FluidPCAQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidRobustScale.sc b/release-packaging/Classes/FluidRobustScale.sc
index db53de9..963745b 100644
--- a/release-packaging/Classes/FluidRobustScale.sc
+++ b/release-packaging/Classes/FluidRobustScale.sc
@@ -60,9 +60,10 @@ FluidRobustScale : FluidRealTimeModel {
 
         this.low_(low).high_(high).invert_(invert);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, this.low, this.high, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
+        ^FluidRobustScaleQuery.kr(K2A.ar(trig),this, this.low, this.high, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
     }
 
 
 }
+
+FluidRobustScaleQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidServerObject.sc b/release-packaging/Classes/FluidServerObject.sc
index d831413..1a76d3b 100644
--- a/release-packaging/Classes/FluidServerObject.sc
+++ b/release-packaging/Classes/FluidServerObject.sc
@@ -308,3 +308,10 @@ FluidRealTimeModel : FluidModelObject
         ^super.new(server,params++[-1,-1]);
     }
 }
+
+FluidRTQuery : FluidProxyUgen
+{
+    *kr{ |trig, obj, args|
+        ^super.kr(this.name,trig, obj.asUGenInput, *args) 
+    }
+}
diff --git a/release-packaging/Classes/FluidStandardize.sc b/release-packaging/Classes/FluidStandardize.sc
index 360fd07..dca033c 100644
--- a/release-packaging/Classes/FluidStandardize.sc
+++ b/release-packaging/Classes/FluidStandardize.sc
@@ -52,7 +52,8 @@ FluidStandardize : FluidRealTimeModel {
         invert = invert ? this.invert;
         this.invert_(invert);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
+        ^FluidStandardizeQuery.kr(K2A.ar(trig),this, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
     }
 }
+
+FluidStandardizeQuery : FluidRTQuery {}
diff --git a/release-packaging/Classes/FluidUMAP.sc b/release-packaging/Classes/FluidUMAP.sc
index 9a2835d..5b183f9 100644
--- a/release-packaging/Classes/FluidUMAP.sc
+++ b/release-packaging/Classes/FluidUMAP.sc
@@ -68,8 +68,8 @@ FluidUMAP : FluidRealTimeModel {
         numDimensions = numDimensions ? this.numDimensions;
         this.numDimensions_(numDimensions);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
-                id,
+        ^FluidUMAPQuery.kr(K2A.ar(trig),
+            this,
 			this.numDimensions,
 			this.numNeighbours,
             this.minDist,
@@ -83,3 +83,5 @@ FluidUMAP : FluidRealTimeModel {
 	cols {|action|}
 	size { |action|}
 }
+
+FluidUMAPQuery : FluidRTQuery {}