diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java
index 11f683c..a365d90 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java
@@ -21,20 +21,21 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
 
-import ch.psi.daq.cassandra.domain.ChannelConfiguration;
-import ch.psi.daq.cassandra.domain.ChannelEvent;
-import ch.psi.daq.cassandra.domain.MetaPulseId;
 import ch.psi.daq.cassandra.reader.CassandraReader;
 import ch.psi.daq.cassandra.util.test.CassandraDataGen;
 import ch.psi.daq.common.time.TimeUtils;
 import ch.psi.daq.domain.DataEvent;
 import ch.psi.daq.domain.FieldNames;
+import ch.psi.daq.domain.events.ChannelConfiguration;
+import ch.psi.daq.domain.events.ChannelEvent;
+import ch.psi.daq.domain.events.MetaPulseId;
+import ch.psi.daq.domain.events.impl.ChannelEventImpl;
 import ch.psi.daq.domain.query.backend.PulseIdRangeQuery;
 import ch.psi.daq.domain.query.backend.TimeRangeQuery;
 import ch.psi.daq.domain.query.event.EventQuery;
 import ch.psi.daq.domain.query.event.StreamEventQuery;
 import ch.psi.daq.domain.reader.Backend;
-import ch.psi.daq.domain.reader.MetaStreamEvent;
+import ch.psi.daq.domain.reader.MetaStreamEventQuery;
 import ch.psi.daq.domain.utils.PropertiesUtils;
 
 public class DummyCassandraReader implements CassandraReader {
@@ -118,8 +119,8 @@ public class DummyCassandraReader implements CassandraReader {
    @Override
    public Stream<ChannelEvent> getEventStream(EventQuery eventQuery, Stream<? extends StreamEventQuery> queryProviders) {
       Stream<ChannelEvent> result = queryProviders.map(ceq -> {
-         if (ceq instanceof MetaStreamEvent) {
-            return getEvent((MetaStreamEvent<ChannelEvent>) ceq);
+         if (ceq instanceof MetaStreamEventQuery) {
+            return getEvent((MetaStreamEventQuery<ChannelEvent>) ceq);
          } else {
             throw new UnsupportedOperationException("This is not yet implemented!");
          }
@@ -169,7 +170,7 @@ public class DummyCassandraReader implements CassandraReader {
                      if (channelLower.contains("waveform")) {
                         long[] value = random.longs(2048).toArray();
                         value[0] = i;
-                        return new ChannelEvent(
+                        return new ChannelEventImpl(
                               channel,
                               iocTime,
                               pulseId,
@@ -184,7 +185,7 @@ public class DummyCassandraReader implements CassandraReader {
                         int[] shape = new int[] {x, y};
                         long[] value = random.longs(x * y).toArray();
                         value[0] = i;
-                        return new ChannelEvent(
+                        return new ChannelEventImpl(
                               channel,
                               iocTime,
                               pulseId,
@@ -194,7 +195,7 @@ public class DummyCassandraReader implements CassandraReader {
                               shape
                         );
                      } else {
-                        return new ChannelEvent(
+                        return new ChannelEventImpl(
                               channel,
                               iocTime,
                               pulseId,
@@ -204,7 +205,7 @@ public class DummyCassandraReader implements CassandraReader {
                         );
                      }
                   });
-
+      
       return eventStream;
    }
 
@@ -234,7 +235,7 @@ public class DummyCassandraReader implements CassandraReader {
     * @{inheritDoc
     */
    @Override
-   public ChannelEvent getEvent(MetaStreamEvent<ChannelEvent> queryInfo, String... columns) {
+   public ChannelEvent getEvent(MetaStreamEventQuery<ChannelEvent> queryInfo, String... columns) {
       if (queryInfo.getPulseId() > 0) {
          return (ChannelEvent) getDummyEvents(queryInfo.getChannel(), queryInfo.getPulseId(), queryInfo.getPulseId(),
                columns)
@@ -248,7 +249,7 @@ public class DummyCassandraReader implements CassandraReader {
     * @{inheritDoc
     */
    @Override
-   public CompletableFuture<ChannelEvent> getEventAsync(MetaStreamEvent<ChannelEvent> queryInfo, String... columns) {
+   public CompletableFuture<ChannelEvent> getEventAsync(MetaStreamEventQuery<ChannelEvent> queryInfo, String... columns) {
       // implement when needed
       throw new UnsupportedOperationException();
    }
@@ -307,15 +308,15 @@ public class DummyCassandraReader implements CassandraReader {
     * @{inheritDoc
     */
    @Override
-   public Stream<? extends MetaStreamEvent<ChannelEvent>> getMetaStream(TimeRangeQuery query) {
+   public Stream<? extends MetaStreamEventQuery<ChannelEvent>> getMetaStream(TimeRangeQuery query) {
 
       return getStreamEventQueryStream(query).map(r -> {
-         return (MetaStreamEvent<ChannelEvent>) r;
+         return (MetaStreamEventQuery<ChannelEvent>) r;
       });
    }
 
    @Override
-   public Stream<ChannelEvent> getEventStream(Stream<? extends MetaStreamEvent<ChannelEvent>> queryInfos) {
+   public Stream<ChannelEvent> getEventStream(Stream<? extends MetaStreamEventQuery<ChannelEvent>> queryInfos) {
       return getEventStream(null, queryInfos);
    }