From 4a6959c1042c92d7aac962300f48e01ce04e1774 Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Sat, 9 Jan 2021 12:49:36 +0000
Subject: [PATCH 1/4] Add alias UGen classes for FluidBuf*Trigger to enable use
 in SynthDefs

---
 release-packaging/Classes/FluidBufAmpGate.sc        | 1 +
 release-packaging/Classes/FluidBufAmpSlice.sc       | 1 +
 release-packaging/Classes/FluidBufAudioTransport.sc | 1 +
 release-packaging/Classes/FluidBufCompose.sc        | 1 +
 release-packaging/Classes/FluidBufFlatten.sc        | 1 +
 release-packaging/Classes/FluidBufHPSS.sc           | 1 +
 release-packaging/Classes/FluidBufLoudness.sc       | 1 +
 release-packaging/Classes/FluidBufMFCC.sc           | 1 +
 release-packaging/Classes/FluidBufMelBands.sc       | 1 +
 release-packaging/Classes/FluidBufNMF.sc            | 1 +
 release-packaging/Classes/FluidBufNMFCross.sc       | 1 +
 release-packaging/Classes/FluidBufNNDSVD.sc         | 1 +
 release-packaging/Classes/FluidBufNoveltySlice.sc   | 1 +
 release-packaging/Classes/FluidBufOnsetSlice.sc     | 1 +
 release-packaging/Classes/FluidBufPitch.sc          | 1 +
 release-packaging/Classes/FluidBufScale.sc          | 1 +
 release-packaging/Classes/FluidBufSines.sc          | 1 +
 release-packaging/Classes/FluidBufSpectralShape.sc  | 1 +
 release-packaging/Classes/FluidBufStats.sc          | 1 +
 release-packaging/Classes/FluidBufThreadDemo.sc     | 1 +
 release-packaging/Classes/FluidBufThresh.sc         | 1 +
 release-packaging/Classes/FluidBufTransientSlice.sc | 1 +
 release-packaging/Classes/FluidBufTransients.sc     | 1 +
 23 files changed, 23 insertions(+)

diff --git a/release-packaging/Classes/FluidBufAmpGate.sc b/release-packaging/Classes/FluidBufAmpGate.sc
index 0063f3c..c644b8d 100644
--- a/release-packaging/Classes/FluidBufAmpGate.sc
+++ b/release-packaging/Classes/FluidBufAmpGate.sc
@@ -41,3 +41,4 @@ FluidBufAmpGate : FluidBufProcessor {
    }
    
 }
+FluidBufAmpGateTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufAmpSlice.sc b/release-packaging/Classes/FluidBufAmpSlice.sc
index 0e20f07..2787176 100644
--- a/release-packaging/Classes/FluidBufAmpSlice.sc
+++ b/release-packaging/Classes/FluidBufAmpSlice.sc
@@ -37,3 +37,4 @@ FluidBufAmpSlice : FluidBufProcessor {
 		);
 	}
 }
+FluidBufAmpSliceTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufAudioTransport.sc b/release-packaging/Classes/FluidBufAudioTransport.sc
index 66e5cb0..52a8182 100644
--- a/release-packaging/Classes/FluidBufAudioTransport.sc
+++ b/release-packaging/Classes/FluidBufAudioTransport.sc
@@ -56,3 +56,4 @@ FluidBufAudioTransport : FluidBufProcessor {
 		)
 	}
 }
+FluidBufAudioTransportTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufCompose.sc b/release-packaging/Classes/FluidBufCompose.sc
index f35390d..d5d8cc5 100644
--- a/release-packaging/Classes/FluidBufCompose.sc
+++ b/release-packaging/Classes/FluidBufCompose.sc
@@ -36,3 +36,4 @@ FluidBufCompose : FluidBufProcessor {
        ).processList([source, startFrame, numFrames, startChan, numChans, gain, destination, destStartFrame, destStartChan, destGain, 1], freeWhenDone, action);
 	}
 }
+FluidBufComposeTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufFlatten.sc b/release-packaging/Classes/FluidBufFlatten.sc
index e664290..60c70ce 100644
--- a/release-packaging/Classes/FluidBufFlatten.sc
+++ b/release-packaging/Classes/FluidBufFlatten.sc
@@ -44,3 +44,4 @@ FluidBufFlatten : FluidBufProcessor {
 
    }
 }
+FluidBufFlattenTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufHPSS.sc b/release-packaging/Classes/FluidBufHPSS.sc
index b7b0a9a..d8913ad 100644
--- a/release-packaging/Classes/FluidBufHPSS.sc
+++ b/release-packaging/Classes/FluidBufHPSS.sc
@@ -49,3 +49,4 @@ FluidBufHPSS : FluidBufProcessor {
 
  	}
 }
+FluidBufHPSSTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufLoudness.sc b/release-packaging/Classes/FluidBufLoudness.sc
index c6c5568..0d3644e 100644
--- a/release-packaging/Classes/FluidBufLoudness.sc
+++ b/release-packaging/Classes/FluidBufLoudness.sc
@@ -46,3 +46,4 @@ FluidBufLoudness : FluidBufProcessor{
 		);
     }
 }
+FluidBufLoudnessTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufMFCC.sc b/release-packaging/Classes/FluidBufMFCC.sc
index f7bd1c3..0d6360e 100644
--- a/release-packaging/Classes/FluidBufMFCC.sc
+++ b/release-packaging/Classes/FluidBufMFCC.sc
@@ -43,3 +43,4 @@ FluidBufMFCC : FluidBufProcessor{
 		);
     }
 }
+FluidBufMFCCTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufMelBands.sc b/release-packaging/Classes/FluidBufMelBands.sc
index d238e61..cb5eb12 100644
--- a/release-packaging/Classes/FluidBufMelBands.sc
+++ b/release-packaging/Classes/FluidBufMelBands.sc
@@ -48,3 +48,4 @@ FluidBufMelBands : FluidBufProcessor {
         );
 	}
 }
+FluidBufMelBandsTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufNMF.sc b/release-packaging/Classes/FluidBufNMF.sc
index c21873b..97f6634 100644
--- a/release-packaging/Classes/FluidBufNMF.sc
+++ b/release-packaging/Classes/FluidBufNMF.sc
@@ -34,3 +34,4 @@ FluidBufNMF : FluidBufProcessor //: UGen {
         ).processList([source, startFrame, numFrames, startChan, numChans, resynth, bases, basesMode, activations, actMode, components,iterations, windowSize, hopSize, fftSize, 1],freeWhenDone,action); 
     }
 }
+FluidBufNMFTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufNMFCross.sc b/release-packaging/Classes/FluidBufNMFCross.sc
index 22499b5..2a50fdc 100644
--- a/release-packaging/Classes/FluidBufNMFCross.sc
+++ b/release-packaging/Classes/FluidBufNMFCross.sc
@@ -46,3 +46,4 @@ FluidBufNMFCross : FluidBufProcessor {
 		);
 	}
 }
+FluidBufNMFCrossTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufNNDSVD.sc b/release-packaging/Classes/FluidBufNNDSVD.sc
index 05d76ea..3aeb6ce 100644
--- a/release-packaging/Classes/FluidBufNNDSVD.sc
+++ b/release-packaging/Classes/FluidBufNNDSVD.sc
@@ -45,3 +45,4 @@ FluidBufNNDSVD : FluidBufProcessor{
 		)
 	}
 }
+FluidBufNNDSVDTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufNoveltySlice.sc b/release-packaging/Classes/FluidBufNoveltySlice.sc
index bae3651..b6c5dc9 100644
--- a/release-packaging/Classes/FluidBufNoveltySlice.sc
+++ b/release-packaging/Classes/FluidBufNoveltySlice.sc
@@ -48,3 +48,4 @@ FluidBufNoveltySlice : FluidBufProcessor {
 		);
 	}
 }
+FluidBufNoveltySliceTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufOnsetSlice.sc b/release-packaging/Classes/FluidBufOnsetSlice.sc
index 77f6f38..2f9a754 100644
--- a/release-packaging/Classes/FluidBufOnsetSlice.sc
+++ b/release-packaging/Classes/FluidBufOnsetSlice.sc
@@ -46,3 +46,4 @@ FluidBufOnsetSlice : FluidBufProcessor {
 		);
 	}
 }
+FluidBufOnsetSliceTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufPitch.sc b/release-packaging/Classes/FluidBufPitch.sc
index 3092496..608a404 100644
--- a/release-packaging/Classes/FluidBufPitch.sc
+++ b/release-packaging/Classes/FluidBufPitch.sc
@@ -48,3 +48,4 @@ FluidBufPitch : FluidBufProcessor{
 		);
 	}
 }
+FluidBufPitchTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufScale.sc b/release-packaging/Classes/FluidBufScale.sc
index a36425d..62c47e7 100644
--- a/release-packaging/Classes/FluidBufScale.sc
+++ b/release-packaging/Classes/FluidBufScale.sc
@@ -41,3 +41,4 @@ FluidBufScale : FluidBufProcessor {
 		);
 	}
 }
+FluidBufScaleTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufSines.sc b/release-packaging/Classes/FluidBufSines.sc
index c4056db..781ed64 100644
--- a/release-packaging/Classes/FluidBufSines.sc
+++ b/release-packaging/Classes/FluidBufSines.sc
@@ -48,3 +48,4 @@ FluidBufSines : FluidBufProcessor {
 	}
 
 }
+FluidBufSinesTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufSpectralShape.sc b/release-packaging/Classes/FluidBufSpectralShape.sc
index 837522a..4a28417 100644
--- a/release-packaging/Classes/FluidBufSpectralShape.sc
+++ b/release-packaging/Classes/FluidBufSpectralShape.sc
@@ -52,3 +52,4 @@ FluidBufSpectralShape : FluidBufProcessor {
 		);
 	}
 }
+FluidBufSpectralShapeTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufStats.sc b/release-packaging/Classes/FluidBufStats.sc
index e29f5d4..c181c9a 100644
--- a/release-packaging/Classes/FluidBufStats.sc
+++ b/release-packaging/Classes/FluidBufStats.sc
@@ -49,3 +49,4 @@ FluidBufStats : FluidBufProcessor {
 
 
 }
+FluidBufStatsTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufThreadDemo.sc b/release-packaging/Classes/FluidBufThreadDemo.sc
index 03f5c3d..393920b 100644
--- a/release-packaging/Classes/FluidBufThreadDemo.sc
+++ b/release-packaging/Classes/FluidBufThreadDemo.sc
@@ -31,3 +31,4 @@ FluidBufThreadDemo : FluidBufProcessor{
 		);
     }
 }
+FluidBufThreadDemoTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufThresh.sc b/release-packaging/Classes/FluidBufThresh.sc
index 47ecaff..9e3f6ca 100644
--- a/release-packaging/Classes/FluidBufThresh.sc
+++ b/release-packaging/Classes/FluidBufThresh.sc
@@ -43,3 +43,4 @@ FluidBufThresh : FluidBufProcessor {
 
 	}
 }
+FluidBufThreshTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufTransientSlice.sc b/release-packaging/Classes/FluidBufTransientSlice.sc
index 7329236..38ff7a7 100644
--- a/release-packaging/Classes/FluidBufTransientSlice.sc
+++ b/release-packaging/Classes/FluidBufTransientSlice.sc
@@ -41,3 +41,4 @@ FluidBufTransientSlice : FluidBufProcessor {
         );
     }
 }
+FluidBufTransientSliceTrigger : FluidProxyUgen {}
diff --git a/release-packaging/Classes/FluidBufTransients.sc b/release-packaging/Classes/FluidBufTransients.sc
index c20f73a..1b71414 100644
--- a/release-packaging/Classes/FluidBufTransients.sc
+++ b/release-packaging/Classes/FluidBufTransients.sc
@@ -41,3 +41,4 @@ FluidBufTransients : FluidBufProcessor {
        );
    }
 }
+FluidBufTransientsTrigger : FluidProxyUgen {}

From e4fb058bdefcc8a66c20ffc928056871fc664ebd Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Tue, 12 Jan 2021 11:31:49 +0000
Subject: [PATCH 2/4] Add FluidDataSetWrTrigger

---
 release-packaging/Classes/FluidDataSetWr.sc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release-packaging/Classes/FluidDataSetWr.sc b/release-packaging/Classes/FluidDataSetWr.sc
index 1d93c88..db4f79d 100644
--- a/release-packaging/Classes/FluidDataSetWr.sc
+++ b/release-packaging/Classes/FluidDataSetWr.sc
@@ -9,3 +9,5 @@ FluidDataSetWr : FluidBufProcessor {
         ^FluidProxyUgen.kr(\FluidDataSetWrTrigger,*args);
 	}
 }
+
+FluidDataSetWrTrigger : FluidProxyUgen {} 

From 4da973c25b53cf990f65aa8e678ff9d5eb18128f Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Tue, 12 Jan 2021 11:32:44 +0000
Subject: [PATCH 3/4] Amend server side RT query Unit name

So that it can be a legal sclang class name
---
 include/wrapper/NonRealtime.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wrapper/NonRealtime.hpp b/include/wrapper/NonRealtime.hpp
index 254f19b..2695cd2 100644
--- a/include/wrapper/NonRealtime.hpp
+++ b/include/wrapper/NonRealtime.hpp
@@ -807,7 +807,7 @@ namespace impl {
       
       static const char* name()
       {
-        static std::string n = std::string(Wrapper::getName()) + "/query";
+        static std::string n = std::string(Wrapper::getName()) + "Query";
         return n.c_str();
       }
             

From 4c277baf6045278fedf5de15138606b7e3690c70 Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Tue, 12 Jan 2021 11:33:28 +0000
Subject: [PATCH 4/4] Add explicit *Query UGen classes for RT model objects

Enables use in SynthDefs
---
 release-packaging/Classes/FluidKDTree.sc        | 6 ++++--
 release-packaging/Classes/FluidKMeans.sc        | 6 ++++--
 release-packaging/Classes/FluidKNNClassifier.sc | 6 ++++--
 release-packaging/Classes/FluidKNNRegressor.sc  | 6 ++++--
 release-packaging/Classes/FluidMLP.sc           | 9 +++++----
 release-packaging/Classes/FluidNormalize.sc     | 6 ++++--
 release-packaging/Classes/FluidPCA.sc           | 5 +++--
 release-packaging/Classes/FluidRobustScale.sc   | 5 +++--
 release-packaging/Classes/FluidServerObject.sc  | 7 +++++++
 release-packaging/Classes/FluidStandardize.sc   | 5 +++--
 release-packaging/Classes/FluidUMAP.sc          | 6 ++++--
 11 files changed, 45 insertions(+), 22 deletions(-)

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 {}