diff --git a/pom.xml b/pom.xml
index 77687dbaf52..73e7a7e8bc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,14 +60,14 @@
4.0.0
3.21.0
2.31.0
- 4.1.0
+ 4.1.1
9.4.44.v20210927
4.4.0
2.1.210
2.0-groovy-3.0
- 1.16.2
+ 1.16.3
5.11.2
- 2.16.1
+ 2.17.2
1.9.7
1.4.200
1.11.19
diff --git a/src/main/java/org/prebid/server/analytics/pubstack/model/EventType.java b/src/main/java/org/prebid/server/analytics/pubstack/model/EventType.java
deleted file mode 100644
index f4b1cbe0460..00000000000
--- a/src/main/java/org/prebid/server/analytics/pubstack/model/EventType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.prebid.server.analytics.pubstack.model;
-
-public enum EventType {
-
- auction, cookiesync, amp, setuid, video
-}
-
diff --git a/src/main/java/org/prebid/server/analytics/AnalyticsReporterDelegator.java b/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java
similarity index 97%
rename from src/main/java/org/prebid/server/analytics/AnalyticsReporterDelegator.java
rename to src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java
index 4da8f31d769..052296d9ce4 100644
--- a/src/main/java/org/prebid/server/analytics/AnalyticsReporterDelegator.java
+++ b/src/main/java/org/prebid/server/analytics/reporter/AnalyticsReporterDelegator.java
@@ -1,4 +1,4 @@
-package org.prebid.server.analytics;
+package org.prebid.server.analytics.reporter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -11,6 +11,7 @@
import io.vertx.core.logging.Logger;
import io.vertx.core.logging.LoggerFactory;
import org.apache.commons.collections4.CollectionUtils;
+import org.prebid.server.analytics.AnalyticsReporter;
import org.prebid.server.analytics.model.AmpEvent;
import org.prebid.server.analytics.model.AuctionEvent;
import org.prebid.server.analytics.model.CookieSyncEvent;
@@ -59,6 +60,7 @@ public AnalyticsReporterDelegator(List delegates,
Vertx vertx,
PrivacyEnforcementService privacyEnforcementService,
Metrics metrics) {
+
this.delegates = Objects.requireNonNull(delegates);
this.vertx = Objects.requireNonNull(vertx);
this.privacyEnforcementService = Objects.requireNonNull(privacyEnforcementService);
@@ -82,6 +84,7 @@ public void processEvent(T event, TcfContext tcfContext) {
private void delegateEvent(T event,
TcfContext tcfContext,
AsyncResult