diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2bf1313..6623300b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/io/getstream/client/NotificationFeed.java b/src/main/java/io/getstream/client/NotificationFeed.java
index f5c7342f..5acbc3cb 100644
--- a/src/main/java/io/getstream/client/NotificationFeed.java
+++ b/src/main/java/io/getstream/client/NotificationFeed.java
@@ -1,26 +1,22 @@
 package io.getstream.client;
 
-import static io.getstream.core.utils.Serialization.deserializeContainer;
+import static io.getstream.core.utils.Serialization.*;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import io.getstream.core.exceptions.StreamException;
-import io.getstream.core.models.Activity;
-import io.getstream.core.models.EnrichedActivity;
-import io.getstream.core.models.FeedID;
-import io.getstream.core.models.NotificationGroup;
+import io.getstream.core.models.*;
 import io.getstream.core.options.*;
 import io.getstream.core.utils.DefaultOptions;
 import java.io.IOException;
-import java.util.List;
 import java8.util.concurrent.CompletableFuture;
 import java8.util.concurrent.CompletionException;
 
-public final class NotificationFeed extends AggregatedFeed {
+public final class NotificationFeed extends Feed {
   NotificationFeed(Client client, FeedID id) {
     super(client, id);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities()
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities()
       throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -29,8 +25,7 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities()
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Limit limit)
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(Limit limit)
       throws StreamException {
     return getActivities(
         limit,
@@ -39,8 +34,7 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Limit
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Offset offset)
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(Offset offset)
       throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -49,8 +43,7 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Offset
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Filter filter)
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(Filter filter)
       throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -59,9 +52,8 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Filter
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(ActivityMarker marker)
-      throws StreamException {
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
+      ActivityMarker marker) throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
         DefaultOptions.DEFAULT_OFFSET,
@@ -69,70 +61,62 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Activi
         marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Offset offset) throws StreamException {
     return getActivities(
         limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Filter filter) throws StreamException {
     return getActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, ActivityMarker marker) throws StreamException {
     return getActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Filter filter, ActivityMarker marker) throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Offset offset, ActivityMarker marker) throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getActivities(limit, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getActivities(limit, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Offset offset, Filter filter, ActivityMarker marker) throws StreamException {
     return getClient()
         .getActivities(getID(), limit, offset, filter, marker)
         .thenApply(
             response -> {
               try {
-                return deserializeContainer(response, NotificationGroup.class, Activity.class);
+                return deserialize(
+                    response, new TypeReference<PaginatedNotificationGroup<Activity>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
             });
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(Class<T> type)
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(Class<T> type)
       throws StreamException {
     return getCustomActivities(
         type,
@@ -142,8 +126,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(Cla
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit) throws StreamException {
     return getCustomActivities(
         type,
@@ -153,8 +136,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Offset offset) throws StreamException {
     return getCustomActivities(
         type,
@@ -164,8 +146,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Filter filter) throws StreamException {
     return getCustomActivities(
         type,
@@ -175,8 +156,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type,
@@ -186,55 +166,47 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Offset offset) throws StreamException {
     return getCustomActivities(
         type, limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Filter filter) throws StreamException {
     return getCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Filter filter, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Offset offset, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getCustomActivities(type, limit, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getCustomActivities(type, limit, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Offset offset, Filter filter, ActivityMarker marker)
       throws StreamException {
     return getClient()
@@ -242,15 +214,14 @@ <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         .thenApply(
             response -> {
               try {
-                return deserializeContainer(response, NotificationGroup.class, type);
+                return deserialize(response, new TypeReference<PaginatedNotificationGroup<T>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
             });
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities()
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities()
       throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -260,8 +231,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -271,8 +241,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -282,8 +251,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -293,8 +261,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -304,8 +271,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -315,8 +281,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -326,8 +291,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -337,8 +301,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -348,8 +311,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -359,8 +321,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -370,8 +331,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -381,8 +341,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -392,8 +351,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -403,8 +361,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -414,29 +371,25 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -446,8 +399,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -457,36 +409,31 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedActivities(limit, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedActivities(limit, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getClient()
@@ -494,16 +441,15 @@ CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActiviti
         .thenApply(
             response -> {
               try {
-                return deserializeContainer(
-                    response, NotificationGroup.class, EnrichedActivity.class);
+                return deserialize(
+                    response, new TypeReference<PaginatedNotificationGroup<EnrichedActivity>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
             });
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -514,8 +460,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -526,8 +471,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -538,8 +482,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -550,8 +493,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -562,8 +504,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -574,8 +515,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -586,8 +526,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -598,8 +537,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -610,8 +548,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -622,8 +559,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -634,8 +570,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -646,8 +581,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -658,8 +592,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -670,8 +603,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -682,30 +614,26 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -716,8 +644,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -728,40 +655,35 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type,
       Limit limit,
       Offset offset,
@@ -774,7 +696,7 @@ <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
         .thenApply(
             response -> {
               try {
-                return deserializeContainer(response, NotificationGroup.class, type);
+                return deserialize(response, new TypeReference<PaginatedNotificationGroup<T>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
diff --git a/src/main/java/io/getstream/cloud/CloudNotificationFeed.java b/src/main/java/io/getstream/cloud/CloudNotificationFeed.java
index 9834d9e2..edbb9e35 100644
--- a/src/main/java/io/getstream/cloud/CloudNotificationFeed.java
+++ b/src/main/java/io/getstream/cloud/CloudNotificationFeed.java
@@ -1,27 +1,23 @@
 package io.getstream.cloud;
 
-import static io.getstream.core.utils.Serialization.deserializeContainer;
+import static io.getstream.core.utils.Serialization.*;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.http.Response;
-import io.getstream.core.models.Activity;
-import io.getstream.core.models.EnrichedActivity;
-import io.getstream.core.models.FeedID;
-import io.getstream.core.models.NotificationGroup;
+import io.getstream.core.models.*;
 import io.getstream.core.options.*;
 import io.getstream.core.utils.DefaultOptions;
 import java.io.IOException;
-import java.util.List;
 import java8.util.concurrent.CompletableFuture;
 import java8.util.concurrent.CompletionException;
 
-public final class CloudNotificationFeed extends CloudAggregatedFeed {
+public final class CloudNotificationFeed extends CloudFeed {
   CloudNotificationFeed(CloudClient client, FeedID id) {
     super(client, id);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities()
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities()
       throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -30,8 +26,7 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities()
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Limit limit)
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(Limit limit)
       throws StreamException {
     return getActivities(
         limit,
@@ -40,8 +35,7 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Limit
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Offset offset)
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(Offset offset)
       throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -50,8 +44,7 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Offset
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Filter filter)
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(Filter filter)
       throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -60,9 +53,8 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Filter
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(ActivityMarker marker)
-      throws StreamException {
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
+      ActivityMarker marker) throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT,
         DefaultOptions.DEFAULT_OFFSET,
@@ -70,70 +62,62 @@ public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(Activi
         marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Offset offset) throws StreamException {
     return getActivities(
         limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Filter filter) throws StreamException {
     return getActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, ActivityMarker marker) throws StreamException {
     return getActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Filter filter, ActivityMarker marker) throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Offset offset, ActivityMarker marker) throws StreamException {
     return getActivities(
         DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getActivities(limit, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  public CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getActivities(limit, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  CompletableFuture<List<NotificationGroup<Activity>>> getActivities(
+  CompletableFuture<PaginatedNotificationGroup<Activity>> getActivities(
       Limit limit, Offset offset, Filter filter, ActivityMarker marker) throws StreamException {
     return getClient()
         .getActivities(getID(), limit, offset, filter, marker)
         .thenApply(
             (Response response) -> {
               try {
-                return deserializeContainer(response, NotificationGroup.class, Activity.class);
+                return deserialize(
+                    response, new TypeReference<PaginatedNotificationGroup<Activity>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
             });
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(Class<T> type)
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(Class<T> type)
       throws StreamException {
     return getCustomActivities(
         type,
@@ -143,8 +127,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(Cla
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit) throws StreamException {
     return getCustomActivities(
         type,
@@ -154,8 +137,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Offset offset) throws StreamException {
     return getCustomActivities(
         type,
@@ -165,8 +147,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Filter filter) throws StreamException {
     return getCustomActivities(
         type,
@@ -176,8 +157,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type,
@@ -187,55 +167,47 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Offset offset) throws StreamException {
     return getCustomActivities(
         type, limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Filter filter) throws StreamException {
     return getCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Filter filter, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Offset offset, ActivityMarker marker) throws StreamException {
     return getCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getCustomActivities(type, limit, DefaultOptions.DEFAULT_OFFSET, filter, marker);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getCustomActivities(type, limit, offset, DefaultOptions.DEFAULT_FILTER, marker);
   }
 
-  @Override
-  <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
+  <T> CompletableFuture<PaginatedNotificationGroup<T>> getCustomActivities(
       Class<T> type, Limit limit, Offset offset, Filter filter, ActivityMarker marker)
       throws StreamException {
     return getClient()
@@ -243,15 +215,14 @@ <T> CompletableFuture<List<NotificationGroup<T>>> getCustomActivities(
         .thenApply(
             (Response response) -> {
               try {
-                return deserializeContainer(response, NotificationGroup.class, type);
+                return deserialize(response, new TypeReference<PaginatedNotificationGroup<T>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
             });
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities()
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities()
       throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -261,8 +232,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -272,8 +242,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -283,8 +252,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -294,8 +262,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -305,8 +272,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -316,8 +282,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -327,8 +292,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -338,8 +302,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -349,8 +312,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -360,8 +322,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -371,8 +332,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -382,8 +342,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -393,8 +352,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -404,8 +362,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT,
@@ -415,29 +372,25 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -447,8 +400,7 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedActivities(
         limit,
@@ -458,36 +410,31 @@ public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedA
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Filter filter, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Offset offset, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedActivities(
         DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedActivities(limit, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  public CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedActivities(limit, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActivities(
+  CompletableFuture<PaginatedNotificationGroup<EnrichedActivity>> getEnrichedActivities(
       Limit limit, Offset offset, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getClient()
@@ -495,16 +442,15 @@ CompletableFuture<List<NotificationGroup<EnrichedActivity>>> getEnrichedActiviti
         .thenApply(
             (Response response) -> {
               try {
-                return deserializeContainer(
-                    response, NotificationGroup.class, EnrichedActivity.class);
+                return deserialize(
+                    response, new TypeReference<PaginatedNotificationGroup<EnrichedActivity>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
             });
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -515,8 +461,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -527,8 +472,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -539,8 +483,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -551,8 +494,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -563,8 +505,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -575,8 +516,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -587,8 +527,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -599,8 +538,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -611,8 +549,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -623,8 +560,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -635,8 +571,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -647,8 +582,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -659,8 +593,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -671,8 +604,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -683,30 +615,26 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter, EnrichmentFlags flags) throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -717,8 +645,7 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset, ActivityMarker marker) throws StreamException {
     return getEnrichedCustomActivities(
         type,
@@ -729,40 +656,35 @@ public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivi
         DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Offset offset, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Filter filter, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
   }
 
-  @Override
-  public <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  public <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type, Limit limit, Offset offset, ActivityMarker marker, EnrichmentFlags flags)
       throws StreamException {
     return getEnrichedCustomActivities(
         type, limit, offset, DefaultOptions.DEFAULT_FILTER, marker, flags);
   }
 
-  @Override
-  <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
+  <T> CompletableFuture<PaginatedNotificationGroup<T>> getEnrichedCustomActivities(
       Class<T> type,
       Limit limit,
       Offset offset,
@@ -775,7 +697,7 @@ <T> CompletableFuture<List<NotificationGroup<T>>> getEnrichedCustomActivities(
         .thenApply(
             (Response response) -> {
               try {
-                return deserializeContainer(response, NotificationGroup.class, type);
+                return deserialize(response, new TypeReference<PaginatedNotificationGroup<T>>() {});
               } catch (StreamException | IOException e) {
                 throw new CompletionException(e);
               }
diff --git a/src/main/java/io/getstream/core/http/OKHTTPClientAdapter.java b/src/main/java/io/getstream/core/http/OKHTTPClientAdapter.java
index 84a8b865..f5734277 100644
--- a/src/main/java/io/getstream/core/http/OKHTTPClientAdapter.java
+++ b/src/main/java/io/getstream/core/http/OKHTTPClientAdapter.java
@@ -103,8 +103,8 @@ public void onFailure(Call call, IOException e) {
 
               @Override
               public void onResponse(Call call, okhttp3.Response response) {
-                io.getstream.core.http.Response httpResponse = buildResponse(response);
-                try (InputStream ignored = httpResponse.getBody()) {
+                try {
+                  io.getstream.core.http.Response httpResponse = buildResponse(response);
                   result.complete(httpResponse);
                 } catch (Exception e) {
                   result.completeExceptionally(e);
diff --git a/src/main/java/io/getstream/core/models/Paginated.java b/src/main/java/io/getstream/core/models/Paginated.java
index e565e226..ceb137f1 100644
--- a/src/main/java/io/getstream/core/models/Paginated.java
+++ b/src/main/java/io/getstream/core/models/Paginated.java
@@ -31,7 +31,7 @@ public String getDuration() {
   }
 
   @JsonCreator
-  private Paginated(
+  public Paginated(
       @JsonProperty("next") String next,
       @JsonProperty("results") List<T> results,
       @JsonProperty("duration") String duration) {
diff --git a/src/main/java/io/getstream/core/models/PaginatedNotificationGroup.java b/src/main/java/io/getstream/core/models/PaginatedNotificationGroup.java
new file mode 100644
index 00000000..106b46e7
--- /dev/null
+++ b/src/main/java/io/getstream/core/models/PaginatedNotificationGroup.java
@@ -0,0 +1,33 @@
+package io.getstream.core.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PaginatedNotificationGroup<T> extends Paginated<NotificationGroup<T>> {
+  private final int unread;
+  private final int unseen;
+
+  @JsonCreator
+  public PaginatedNotificationGroup(
+      @JsonProperty("next") String next,
+      @JsonProperty("results") List<NotificationGroup<T>> results,
+      @JsonProperty("duration") String duration,
+      @JsonProperty("unread") int unread,
+      @JsonProperty("unseen") int unseen) {
+    super(next, results, duration);
+
+    this.unread = unread;
+    this.unseen = unseen;
+  }
+
+  public int getUnread() {
+    return this.unread;
+  }
+
+  public int getUnseen() {
+    return this.unseen;
+  }
+}
diff --git a/src/test/java/io/getstream/client/NotificationFeedTest.java b/src/test/java/io/getstream/client/NotificationFeedTest.java
index 6f881fa4..3bbd1e49 100644
--- a/src/test/java/io/getstream/client/NotificationFeedTest.java
+++ b/src/test/java/io/getstream/client/NotificationFeedTest.java
@@ -1,10 +1,11 @@
 package io.getstream.client;
 
+import static org.junit.Assert.*;
+
 import io.getstream.core.http.OKHTTPClientAdapter;
 import io.getstream.core.models.Activity;
 import io.getstream.core.models.EnrichedActivity;
-import io.getstream.core.models.NotificationGroup;
-import java.util.List;
+import io.getstream.core.models.PaginatedNotificationGroup;
 import okhttp3.OkHttpClient;
 import org.junit.Test;
 
@@ -26,7 +27,9 @@ public void getActivityGroups() throws Exception {
             .build();
 
     NotificationFeed feed = client.notificationFeed("notification", "1");
-    List<NotificationGroup<Activity>> result = feed.getActivities().join();
+    PaginatedNotificationGroup<Activity> result = feed.getActivities().join();
+    assertFalse(result.getResults().isEmpty());
+    assertNotNull(result.getResults().get(0).getID());
   }
 
   @Test
@@ -37,6 +40,8 @@ public void getEnrichedActivityGroups() throws Exception {
             .build();
 
     NotificationFeed feed = client.notificationFeed("notification", "1");
-    List<NotificationGroup<EnrichedActivity>> result = feed.getEnrichedActivities().join();
+    PaginatedNotificationGroup<EnrichedActivity> result = feed.getEnrichedActivities().join();
+    assertFalse(result.getResults().isEmpty());
+    assertNotNull(result.getResults().get(0).getID());
   }
 }
diff --git a/src/test/java/io/getstream/cloud/CloudNotificationFeedTest.java b/src/test/java/io/getstream/cloud/CloudNotificationFeedTest.java
index 7448ccb3..dde7f51c 100644
--- a/src/test/java/io/getstream/cloud/CloudNotificationFeedTest.java
+++ b/src/test/java/io/getstream/cloud/CloudNotificationFeedTest.java
@@ -1,13 +1,14 @@
 package io.getstream.cloud;
 
+import static org.junit.Assert.*;
+
 import io.getstream.client.Client;
 import io.getstream.core.http.Token;
 import io.getstream.core.models.Activity;
 import io.getstream.core.models.EnrichedActivity;
-import io.getstream.core.models.NotificationGroup;
+import io.getstream.core.models.PaginatedNotificationGroup;
 import io.getstream.core.utils.Enrichment;
 import java.net.MalformedURLException;
-import java.util.List;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -53,7 +54,9 @@ public void getActivityGroups() throws Exception {
     CloudClient client = CloudClient.builder(apiKey, token, userID).build();
 
     CloudNotificationFeed feed = client.notificationFeed("notification", userID);
-    List<NotificationGroup<Activity>> result = feed.getActivities().join();
+    PaginatedNotificationGroup<Activity> result = feed.getActivities().join();
+    assertFalse(result.getResults().isEmpty());
+    assertNotNull(result.getResults().get(0).getID());
   }
 
   @Test
@@ -61,6 +64,6 @@ public void getEnrichedActivityGroups() throws Exception {
     CloudClient client = CloudClient.builder(apiKey, token, userID).build();
 
     CloudNotificationFeed feed = client.notificationFeed("rich_notification", userID);
-    List<NotificationGroup<EnrichedActivity>> result = feed.getEnrichedActivities().join();
+    PaginatedNotificationGroup<EnrichedActivity> result = feed.getEnrichedActivities().join();
   }
 }