diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
index e66d65e7a..37611d7a2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
@@ -42,6 +42,7 @@ import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.UserMetadata
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
@@ -60,6 +61,7 @@ class User(
     var latestMetadataRelay: String? = null
     var latestContactList: ContactListEvent? = null
     var latestBookmarkList: BookmarkListEvent? = null
+    var followSets: Map<String, PeopleListEvent> = emptyMap()
 
     var reports = mapOf<User, Set<Note>>()
         private set
@@ -438,16 +440,19 @@ class UserFlowSet(
     val metadata = UserBundledRefresherFlow(u)
     val follows = UserBundledRefresherFlow(u)
     val relays = UserBundledRefresherFlow(u)
+    val followSets = UserBundledRefresherFlow(u)
 
     fun isInUse(): Boolean =
         metadata.stateFlow.subscriptionCount.value > 0 ||
             relays.stateFlow.subscriptionCount.value > 0 ||
-            follows.stateFlow.subscriptionCount.value > 0
+            follows.stateFlow.subscriptionCount.value > 0 ||
+            followSets.stateFlow.subscriptionCount.value > 0
 
     fun destroy() {
         metadata.destroy()
         relays.destroy()
         follows.destroy()
+        followSets.destroy()
     }
 }
 
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt
index 066822565..f83958bca 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/PeopleListEvent.kt
@@ -76,6 +76,13 @@ class PeopleListEvent(
         }
     }
 
+    class FollowSet(
+        val isPrivate: Boolean,
+        val title: String,
+        val description: String?,
+        val profileList: Set<String>,
+    )
+
     @Immutable
     class UsersAndWords(
         val users: Set<String> = setOf(),