diff --git a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
index 867761e..46339a3 100644
--- a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
+++ b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
@@ -36,6 +36,8 @@ import ch.psi.daq.domain.backend.Backend;
 import ch.psi.daq.domain.config.DomainConfig;
 import ch.psi.daq.domain.config.DomainConfigCORS;
 import ch.psi.daq.domain.events.ChannelConfiguration;
+import ch.psi.daq.domain.json.mixin.HistoricChannelConfigurationPropertyFilterMixin;
+import ch.psi.daq.domain.json.mixin.PropertyFilterMixin;
 import ch.psi.daq.domain.query.backend.BackendQuery;
 import ch.psi.daq.domain.query.backend.analyzer.BackendQueryAnalyzer;
 import ch.psi.daq.domain.query.operation.Aggregation;
@@ -48,8 +50,6 @@ import ch.psi.daq.query.analyzer.BackendQueryAnalyzerImpl;
 import ch.psi.daq.query.config.QueryConfig;
 import ch.psi.daq.queryrest.controller.validator.ConfigQueryValidator;
 import ch.psi.daq.queryrest.controller.validator.EventQueryValidator;
-import ch.psi.daq.queryrest.model.HistoricChannelConfigurationPropertyFilterMixin;
-import ch.psi.daq.queryrest.model.PropertyFilterMixin;
 import ch.psi.daq.queryrest.query.QueryManager;
 import ch.psi.daq.queryrest.query.QueryManagerImpl;
 import ch.psi.daq.queryrest.response.PolymorphicResponseMixIn;
diff --git a/src/main/java/ch/psi/daq/queryrest/model/HistoricChannelConfigurationPropertyFilterMixin.java b/src/main/java/ch/psi/daq/queryrest/model/HistoricChannelConfigurationPropertyFilterMixin.java
deleted file mode 100644
index ceac608..0000000
--- a/src/main/java/ch/psi/daq/queryrest/model/HistoricChannelConfigurationPropertyFilterMixin.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ch.psi.daq.queryrest.model;
-
-import com.fasterxml.jackson.annotation.JsonFilter;
-
-/**
- * Kind of marker for ObjectMapper MixIn. Use this instead of to make sure we can use different
- * properties in case ChannelEvents and ChannelConfigurations are mixed in a response.
- */
-@JsonFilter("historicChannelConfigurationPropertyFilter")
-public class HistoricChannelConfigurationPropertyFilterMixin {
-   public static final String FILTER_NAME = "historicChannelConfigurationPropertyFilter";
-}
diff --git a/src/main/java/ch/psi/daq/queryrest/model/PropertyFilterMixin.java b/src/main/java/ch/psi/daq/queryrest/model/PropertyFilterMixin.java
deleted file mode 100644
index 767846e..0000000
--- a/src/main/java/ch/psi/daq/queryrest/model/PropertyFilterMixin.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package ch.psi.daq.queryrest.model;
-
-import com.fasterxml.jackson.annotation.JsonFilter;
-
-/**
- *  Kind of marker for ObjectMapper MixIn
- */
-@JsonFilter("namedPropertyFilter")
-public class PropertyFilterMixin {
-   public static final String FILTER_NAME = "namedPropertyFilter";
-}
diff --git a/src/main/java/ch/psi/daq/queryrest/response/formatter/DAQQueriesResponseFormatter.java b/src/main/java/ch/psi/daq/queryrest/response/formatter/DAQQueriesResponseFormatter.java
index c8dd508..fec714e 100644
--- a/src/main/java/ch/psi/daq/queryrest/response/formatter/DAQQueriesResponseFormatter.java
+++ b/src/main/java/ch/psi/daq/queryrest/response/formatter/DAQQueriesResponseFormatter.java
@@ -37,6 +37,8 @@ import ch.psi.daq.common.tuple.Quadruple;
 import ch.psi.daq.domain.DataEvent;
 import ch.psi.daq.domain.events.ChannelConfiguration;
 import ch.psi.daq.domain.json.ChannelName;
+import ch.psi.daq.domain.json.mixin.HistoricChannelConfigurationPropertyFilterMixin;
+import ch.psi.daq.domain.json.mixin.PropertyFilterMixin;
 import ch.psi.daq.domain.query.DAQQueryElement;
 import ch.psi.daq.domain.query.backend.BackendQuery;
 import ch.psi.daq.domain.query.bin.BinningStrategy;
@@ -50,8 +52,6 @@ import ch.psi.daq.domain.query.operation.QueryField;
 import ch.psi.daq.domain.request.range.RequestRange;
 import ch.psi.daq.query.bin.aggregate.BinnedValueCombiner;
 import ch.psi.daq.queryrest.config.QueryRestConfig;
-import ch.psi.daq.queryrest.model.HistoricChannelConfigurationPropertyFilterMixin;
-import ch.psi.daq.queryrest.model.PropertyFilterMixin;
 import ch.psi.daq.queryrest.response.AbstractHTTPResponse;
 import ch.psi.daq.queryrest.response.ResponseFormatter;
 import ch.psi.daq.queryrest.response.json.JSONResponseStreamWriter;