diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java b/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java
index 559ffbe06..b7a18e93b 100644
--- a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java
+++ b/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java
@@ -57,12 +57,4 @@ public class AmqpDriverAdapter extends BaseDriverAdapter<AmqpTimeTrackOp, AmqpSp
         return super.getConfigModel().add(AmqpSpace.getConfigModel());
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "amqp")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public AmqpDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new AmqpDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapterLoader.java b/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapterLoader.java
new file mode 100644
index 000000000..3c23158d7
--- /dev/null
+++ b/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.amqp;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "amqp")
+public class AmqpDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public AmqpDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new AmqpDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
index 39dce2271..074a61d01 100644
--- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
@@ -109,12 +109,4 @@ public class Cqld4DriverAdapter extends BaseDriverAdapter<Op, Cqld4Space> {
         return remappers;
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "cqld4")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public Cqld4DriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new Cqld4DriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapterLoader.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapterLoader.java
new file mode 100644
index 000000000..ea18bcc2d
--- /dev/null
+++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.cqld4;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "cqld4")
+public class Cqld4DriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public Cqld4DriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new Cqld4DriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java
index 1b990b053..050a42c32 100644
--- a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java
+++ b/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java
@@ -1,5 +1,23 @@
 package io.nosqlbench.adapter.diag;
 
+/*
+ * Copyright (c) 2022 nosqlbench
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 import io.nosqlbench.api.labels.NBLabels;
 import io.nosqlbench.components.NBComponent;
 import io.nosqlbench.nb.annotations.Service;
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java
index 615f11a88..1c7e6f929 100644
--- a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java
+++ b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java
@@ -55,12 +55,4 @@ public class DynamoDBDriverAdapter extends BaseDriverAdapter<DynamoDBOp, DynamoD
         return super.getConfigModel().add(DynamoDBSpace.getConfigModel());
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "dynamodb")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public DynamoDBDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new DynamoDBDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapterLoader.java b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapterLoader.java
new file mode 100644
index 000000000..83d022e67
--- /dev/null
+++ b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.dynamodb;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "dynamodb")
+public class DynamoDBDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public DynamoDBDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new DynamoDBDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java b/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java
index e008dd5d5..385eb693a 100644
--- a/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java
+++ b/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java
@@ -85,12 +85,4 @@ public class HttpDriverAdapter extends BaseDriverAdapter<HttpOp, HttpSpace> {
         return super.getConfigModel().add(HttpSpace.getConfigModel()).add(thisCfgModel);
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "http")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public HttpDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new HttpDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapterLoader.java b/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapterLoader.java
new file mode 100644
index 000000000..0c400606b
--- /dev/null
+++ b/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.http;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "http")
+public class HttpDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public HttpDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new HttpDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java b/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java
index 705a8956a..8962f4f83 100644
--- a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java
+++ b/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java
@@ -56,12 +56,5 @@ public class KafkaDriverAdapter extends BaseDriverAdapter<KafkaOp, KafkaSpace> {
     public NBConfigModel getConfigModel() {
         return super.getConfigModel().add(KafkaSpace.getConfigModel());
     }
-    @Service(value = DriverAdapterLoader.class,selector = "kafka")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public KafkaDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new KafkaDriverAdapter(parent,childLabels);
-        }
-    }
 
 }
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapterLoader.java b/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapterLoader.java
new file mode 100644
index 000000000..a1a3fbc18
--- /dev/null
+++ b/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.kafka;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "kafka")
+public class KafkaDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public KafkaDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new KafkaDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/KafkaDriverAdapterLoader.java b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/KafkaDriverAdapterLoader.java
new file mode 100644
index 000000000..0a7040fd1
--- /dev/null
+++ b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/KafkaDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.mongodb.core;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "mongodb")
+public class KafkaDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public MongodbDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new MongodbDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java
index 42fc4c4ff..0e4553bb3 100644
--- a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java
+++ b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java
@@ -54,12 +54,4 @@ public class MongodbDriverAdapter extends BaseDriverAdapter<Op, MongoSpace> {
         return super.getConfigModel().add(MongoSpace.getConfigModel());
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "mongodb")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public MongodbDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new MongodbDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-pgvector/src/main/java/io/nosqlbench/adapter/pgvector/PGVectorDriverAdapterLoader.java b/adapter-pgvector/src/main/java/io/nosqlbench/adapter/pgvector/PGVectorDriverAdapterLoader.java
new file mode 100644
index 000000000..914c1522b
--- /dev/null
+++ b/adapter-pgvector/src/main/java/io/nosqlbench/adapter/pgvector/PGVectorDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.pgvector;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "jdbc")
+public class PGVectorDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public PGVectorDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new PGVectorDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java b/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java
index 0774274ce..0ecdadba8 100644
--- a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java
+++ b/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java
@@ -54,12 +54,4 @@ public class PineconeDriverAdapter extends BaseDriverAdapter<PineconeOp, Pinecon
         return super.getConfigModel().add(PineconeSpace.getConfigModel());
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "pinecone")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public PineconeDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new PineconeDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapterLoader.java b/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapterLoader.java
new file mode 100644
index 000000000..9db014a19
--- /dev/null
+++ b/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.pinecone;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "pinecone")
+public class PineconeDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public PineconeDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new PineconeDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java
index 2e4ed7f47..2910c1d1c 100644
--- a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java
+++ b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java
@@ -58,12 +58,4 @@ public class PulsarDriverAdapter extends BaseDriverAdapter<PulsarOp, PulsarSpace
         return super.getConfigModel().add(PulsarSpace.getConfigModel());
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "pulsar")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public PulsarDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new PulsarDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapterLoader.java b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapterLoader.java
new file mode 100644
index 000000000..b3b424204
--- /dev/null
+++ b/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.pulsar;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "pulsar")
+public class PulsarDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public PulsarDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new PulsarDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java b/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java
index 906b464ee..c312fb212 100644
--- a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java
+++ b/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java
@@ -57,12 +57,4 @@ public class S4JDriverAdapter extends BaseDriverAdapter<S4JOp, S4JSpace> {
         return super.getConfigModel().add(S4JSpace.getConfigModel());
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "s4j")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public S4JDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new S4JDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapterLoader.java b/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapterLoader.java
new file mode 100644
index 000000000..8946b857e
--- /dev/null
+++ b/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.s4j;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "s4j")
+public class S4JDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public S4JDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new S4JDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java b/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java
index 1b681cb12..a8b3be99a 100644
--- a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java
+++ b/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java
@@ -116,13 +116,5 @@ public class StdoutDriverAdapter extends BaseDriverAdapter<StdoutOp, StdoutSpace
         return stmtTemplate;
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "stdout")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public StdoutDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new StdoutDriverAdapter(parent,childLabels);
-        }
-    }
-
 
 }
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapterLoader.java b/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapterLoader.java
new file mode 100644
index 000000000..592716506
--- /dev/null
+++ b/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.stdout;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "stdout")
+public class StdoutDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public StdoutDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new StdoutDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java b/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java
index 81e3e8094..89a472e54 100644
--- a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java
+++ b/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java
@@ -71,12 +71,4 @@ public class TcpClientDriverAdapter extends BaseDriverAdapter<TcpClientOp, TcpCl
         return adap.getSyntheticOpTemplates(opsDocList, cfg);
     }
 
-    @Service(value = DriverAdapterLoader.class,selector = "tcpclient")
-    public static class Loader implements DriverAdapterLoader {
-        @Override
-        public TcpClientDriverAdapter load(NBComponent parent, NBLabels childLabels) {
-            return new TcpClientDriverAdapter(parent,childLabels);
-        }
-    }
-
 }
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapterLoader.java b/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapterLoader.java
new file mode 100644
index 000000000..d9220334b
--- /dev/null
+++ b/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapterLoader.java
@@ -0,0 +1,14 @@
+package io.nosqlbench.adapter.tcpclient;
+
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
+import io.nosqlbench.api.labels.NBLabels;
+import io.nosqlbench.components.NBComponent;
+import io.nosqlbench.nb.annotations.Service;
+
+@Service(value = DriverAdapterLoader.class, selector = "tcpclient")
+public class TcpClientDriverAdapterLoader implements DriverAdapterLoader {
+    @Override
+    public TcpClientDriverAdapter load(NBComponent parent, NBLabels childLabels) {
+        return new TcpClientDriverAdapter(parent, childLabels);
+    }
+}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
index e2f29cb6c..ad91c240a 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
@@ -16,6 +16,7 @@
 
 package io.nosqlbench.engine.core.lifecycle.activity;
 
+import io.nosqlbench.adapter.diag.DriverAdapterLoader;
 import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter;
 import io.nosqlbench.components.NBComponent;
 import io.nosqlbench.api.content.Content;
@@ -43,6 +44,7 @@ public class ActivityTypeLoader {
     private static final Logger logger = LogManager.getLogger(ActivityTypeLoader.class);
     private final SimpleServiceLoader<ActivityType> ACTIVITYTYPE_SPI_FINDER = new SimpleServiceLoader<ActivityType>(ActivityType.class, Maturity.Any);
     private final SimpleServiceLoader<DriverAdapter> DRIVERADAPTER_SPI_FINDER = new SimpleServiceLoader<>(DriverAdapter.class, Maturity.Any);
+    private final SimpleServiceLoader<DriverAdapterLoader> DRIVERADAPTERLOADER_SPI_FINDER = new SimpleServiceLoader<>(DriverAdapterLoader.class, Maturity.Any);
     private final Set<URL> jarUrls = new HashSet<>();
 
     public ActivityTypeLoader setMaturity(final Maturity maturity) {
@@ -153,11 +155,12 @@ public class ActivityTypeLoader {
     }
 
     public Set<String> getAllSelectors() {
-        final Map<String, Maturity> allSelectors = this.ACTIVITYTYPE_SPI_FINDER.getAllSelectors();
-        final Map<String, Maturity> addAdapters = this.DRIVERADAPTER_SPI_FINDER.getAllSelectors();
+//        final Map<String, Maturity> allSelectors = this.ACTIVITYTYPE_SPI_FINDER.getAllSelectors();
+//        final Map<String, Maturity> allAdapters = this.DRIVERADAPTER_SPI_FINDER.getAllSelectors();
+        final Map<String, Maturity> allAdapterLoaders = this.DRIVERADAPTERLOADER_SPI_FINDER.getAllSelectors();
         final Set<String> all = new LinkedHashSet<>();
-        all.addAll(allSelectors.keySet());
-        all.addAll(addAdapters.keySet());
+//        all.addAll(allSelectors.keySet());
+        all.addAll(allAdapterLoaders.keySet());
         return all;
     }
 }