diff --git a/CHANGELOG.md b/CHANGELOG.md
index fac2c68640f..4616a414b90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,18 @@
 ### ⬆️ Improved
 
 ### ✅ Added
+- Add `ChatClient.getPoll(pollId: String)` for retrieving a poll by its ID. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Add `ChatClient.partialUpdatePoll(pollId: String, set: Map<String, Any>, unset: List<String>)` for partially updating a poll. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Add `ChatClient.createPollOption(pollId: String, option: CreatePollOptionRequest)` for creating a poll option. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Add `ChatClient.updatePollOption(pollId: String, option: UpdatePollOptionRequest)` for updating a poll option. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Add `ChatClient.deletePollOption(pollId: String, optionId: String)` for deleting a poll option. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Add `ChatClient.queryPollVotes(pollId: String, filter: FilterObject?, limit: Int?, next: String?, sort: QuerySorter<Vote>?)` for querying poll votes with filtering, sorting, and pagination support. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Add `ChatClient.queryPolls(filter: FilterObject?, limit: Int?, next: String?, sort: QuerySorter<Poll>?)` for querying polls with filtering, sorting, and pagination support. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Add `PollConfig` constructor with support for extra custom data for the poll and the poll options. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
 
 ### ⚠️ Changed
+- Deprecate `PollConfig` constructor without support for custom data. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
+- Deprecate `ChatClient.suggestPollOption(pollId: String, option: String)` in favour of `ChatClient.createPollOption(pollId: String, option: CreatePollOptionRequest)`. [#5966](https://github.com/GetStream/stream-chat-android/pull/5966)
 
 ### ❌ Removed
 
@@ -56,6 +66,7 @@
 
 ## stream-chat-android-ui-components
 ### 🐞 Fixed
+- Disallow creating polls in threads. [#5970](https://github.com/GetStream/stream-chat-android/pull/5970)
 
 ### ⬆️ Improved
 
@@ -67,6 +78,7 @@
 
 ## stream-chat-android-compose
 ### 🐞 Fixed
+- Disallow creating polls in threads. [#5970](https://github.com/GetStream/stream-chat-android/pull/5970)
 
 ### ⬆️ Improved
 
diff --git a/DEPRECATIONS.md b/DEPRECATIONS.md
index a1a93d3d6c6..aec1535d2b6 100644
--- a/DEPRECATIONS.md
+++ b/DEPRECATIONS.md
@@ -4,6 +4,8 @@ This document lists deprecated constructs in the SDK, with their expected time 
 
 | API / Feature                                                                                                                                                                              | Deprecated (warning)   | Deprecated (error)    | Removed               | Notes                                                                                                                                                                                                                                                                                                                                                |
 |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------|-----------------------|-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `PollConfig(String, List<String>, String, VotingVisibility, Boolean, Int, Boolean, Boolean)` constructor                                                                                   | 2025.10.20 ⌛           |                       |                       | This constructor has been deprecated. Please use `PollConfig(String, List<PollOption>, String, VotingVisibility, Boolean, Int, Boolean, Boolean, Map<String, Any>)` instead.                                                                                                                                                                         |
+| `ChatClient.suggestPollOption(pollId: String, option: String)` method                                                                                                                      | 2025.10.20 ⌛           |                       |                       | This method has been deprecated. Please use `ChatClient.createPollOption(pollId: String, option: CreatePollOptionRequest)` instead.                                                                                                                                                                                                                  |
 | `SendReactionListener.onSendReactionRequest(cid: String?, reaction: Reaction, enforceUnique: Boolean, currentUser: User)` method                                                           | 2025.09.22 ⌛           |                       |                       | This method has been deprecated. Please use `SendReactionListener.onSendReactionRequest(cid: String?, reaction: Reaction, enforceUnique: Boolean, skipPush: Boolean, currentUser: User)` instead.                                                                                                                                                    |
 | `AudioWaveVSeekbar`<br/>*compose*                                                                                                                                                          | 2025.09.22 ⌛           |                       |                       |                                                                                                                                                                                                                                                                                                                                                      |
 | `StateRegistry.queryThreads()` method                                                                                                                                                      | 2025.09.15 ⌛           |                       |                       | This method has been deprecated as it is no longer used internally. Please use the `StateRegistry.queryThreads(FilterObject, QuerySorter)` method instead for better flexibility.                                                                                                                                                                    |
diff --git a/stream-chat-android-client/api/stream-chat-android-client.api b/stream-chat-android-client/api/stream-chat-android-client.api
index d538b9f6f5d..067a69eb45e 100644
--- a/stream-chat-android-client/api/stream-chat-android-client.api
+++ b/stream-chat-android-client/api/stream-chat-android-client.api
@@ -41,6 +41,7 @@ public final class io/getstream/chat/android/client/ChatClient {
 	public final fun createChannel (Ljava/lang/String;Ljava/lang/String;Lio/getstream/chat/android/client/query/CreateChannelParams;)Lio/getstream/result/call/Call;
 	public final fun createChannel (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;)Lio/getstream/result/call/Call;
 	public final fun createDraftMessage (Ljava/lang/String;Ljava/lang/String;Lio/getstream/chat/android/models/DraftMessage;)Lio/getstream/result/call/Call;
+	public final fun createPollOption (Ljava/lang/String;Lio/getstream/chat/android/client/api/models/CreatePollOptionRequest;)Lio/getstream/result/call/Call;
 	public final fun createReminder (Ljava/lang/String;Ljava/util/Date;)Lio/getstream/result/call/Call;
 	public final fun createVideoCall (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/getstream/result/call/Call;
 	public final fun deleteChannel (Ljava/lang/String;Ljava/lang/String;)Lio/getstream/result/call/Call;
@@ -55,6 +56,7 @@ public final class io/getstream/chat/android/client/ChatClient {
 	public static synthetic fun deleteMessage$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;ZILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun deleteMessageForMe (Ljava/lang/String;)Lio/getstream/result/call/Call;
 	public final fun deletePoll (Ljava/lang/String;)Lio/getstream/result/call/Call;
+	public final fun deletePollOption (Ljava/lang/String;Ljava/lang/String;)Lio/getstream/result/call/Call;
 	public final fun deleteReaction (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/getstream/result/call/Call;
 	public static synthetic fun deleteReaction$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun deleteReminder (Ljava/lang/String;)Lio/getstream/result/call/Call;
@@ -92,6 +94,7 @@ public final class io/getstream/chat/android/client/ChatClient {
 	public static final fun getOFFLINE_SUPPORT_ENABLED ()Z
 	public final fun getPendingMessage (Ljava/lang/String;)Lio/getstream/result/call/Call;
 	public final fun getPinnedMessages (Ljava/lang/String;Ljava/lang/String;ILio/getstream/chat/android/models/querysort/QuerySorter;Lio/getstream/chat/android/client/api/models/PinnedMessagesPagination;)Lio/getstream/result/call/Call;
+	public final fun getPoll (Ljava/lang/String;)Lio/getstream/result/call/Call;
 	public final fun getReactions (Ljava/lang/String;II)Lio/getstream/result/call/Call;
 	public final fun getReplies (Ljava/lang/String;I)Lio/getstream/result/call/Call;
 	public final fun getRepliesMore (Ljava/lang/String;Ljava/lang/String;I)Lio/getstream/result/call/Call;
@@ -129,6 +132,8 @@ public final class io/getstream/chat/android/client/ChatClient {
 	public static synthetic fun partialUpdateMember$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun partialUpdateMessage (Ljava/lang/String;Ljava/util/Map;Ljava/util/List;)Lio/getstream/result/call/Call;
 	public static synthetic fun partialUpdateMessage$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lio/getstream/result/call/Call;
+	public final fun partialUpdatePoll (Ljava/lang/String;Ljava/util/Map;Ljava/util/List;)Lio/getstream/result/call/Call;
+	public static synthetic fun partialUpdatePoll$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun partialUpdateThread (Ljava/lang/String;Ljava/util/Map;Ljava/util/List;)Lio/getstream/result/call/Call;
 	public static synthetic fun partialUpdateThread$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun partialUpdateUser (Ljava/lang/String;Ljava/util/Map;Ljava/util/List;)Lio/getstream/result/call/Call;
@@ -156,6 +161,10 @@ public final class io/getstream/chat/android/client/ChatClient {
 	public static synthetic fun queryDrafts$default (Lio/getstream/chat/android/client/ChatClient;Lio/getstream/chat/android/models/FilterObject;ILjava/lang/String;Lio/getstream/chat/android/models/querysort/QuerySorter;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun queryMembers (Ljava/lang/String;Ljava/lang/String;IILio/getstream/chat/android/models/FilterObject;Lio/getstream/chat/android/models/querysort/QuerySorter;Ljava/util/List;)Lio/getstream/result/call/Call;
 	public static synthetic fun queryMembers$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Ljava/lang/String;IILio/getstream/chat/android/models/FilterObject;Lio/getstream/chat/android/models/querysort/QuerySorter;Ljava/util/List;ILjava/lang/Object;)Lio/getstream/result/call/Call;
+	public final fun queryPollVotes (Ljava/lang/String;Lio/getstream/chat/android/models/FilterObject;Ljava/lang/Integer;Ljava/lang/String;Lio/getstream/chat/android/models/querysort/QuerySorter;)Lio/getstream/result/call/Call;
+	public static synthetic fun queryPollVotes$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Lio/getstream/chat/android/models/FilterObject;Ljava/lang/Integer;Ljava/lang/String;Lio/getstream/chat/android/models/querysort/QuerySorter;ILjava/lang/Object;)Lio/getstream/result/call/Call;
+	public final fun queryPolls (Lio/getstream/chat/android/models/FilterObject;Ljava/lang/Integer;Ljava/lang/String;Lio/getstream/chat/android/models/querysort/QuerySorter;)Lio/getstream/result/call/Call;
+	public static synthetic fun queryPolls$default (Lio/getstream/chat/android/client/ChatClient;Lio/getstream/chat/android/models/FilterObject;Ljava/lang/Integer;Ljava/lang/String;Lio/getstream/chat/android/models/querysort/QuerySorter;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun queryReminders (Lio/getstream/chat/android/models/FilterObject;ILjava/lang/String;Lio/getstream/chat/android/models/querysort/QuerySorter;)Lio/getstream/result/call/Call;
 	public static synthetic fun queryReminders$default (Lio/getstream/chat/android/client/ChatClient;Lio/getstream/chat/android/models/FilterObject;ILjava/lang/String;Lio/getstream/chat/android/models/querysort/QuerySorter;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun queryThreads (Lio/getstream/chat/android/client/api/models/QueryThreadsRequest;)Lio/getstream/result/call/Call;
@@ -238,6 +247,7 @@ public final class io/getstream/chat/android/client/ChatClient {
 	public static synthetic fun updateChannelPartial$default (Lio/getstream/chat/android/client/ChatClient;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lio/getstream/result/call/Call;
 	public final fun updateLiveLocation (Ljava/lang/String;DDLjava/lang/String;)Lio/getstream/result/call/Call;
 	public final fun updateMessage (Lio/getstream/chat/android/models/Message;)Lio/getstream/result/call/Call;
+	public final fun updatePollOption (Ljava/lang/String;Lio/getstream/chat/android/client/api/models/UpdatePollOptionRequest;)Lio/getstream/result/call/Call;
 	public final fun updateReminder (Ljava/lang/String;Ljava/util/Date;)Lio/getstream/result/call/Call;
 	public final fun updateUser (Lio/getstream/chat/android/models/User;)Lio/getstream/result/call/Call;
 	public final fun updateUsers (Ljava/util/List;)Lio/getstream/result/call/Call;
@@ -320,6 +330,20 @@ public final class io/getstream/chat/android/client/api/ChatClientConfig {
 	public final fun setWssUrl (Ljava/lang/String;)V
 }
 
+public final class io/getstream/chat/android/client/api/models/CreatePollOptionRequest {
+	public fun <init> (Ljava/lang/String;Ljava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/util/Map;
+	public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lio/getstream/chat/android/client/api/models/CreatePollOptionRequest;
+	public static synthetic fun copy$default (Lio/getstream/chat/android/client/api/models/CreatePollOptionRequest;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lio/getstream/chat/android/client/api/models/CreatePollOptionRequest;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getExtraData ()Ljava/util/Map;
+	public final fun getText ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class io/getstream/chat/android/client/api/models/GetThreadOptions {
 	public fun <init> ()V
 	public fun <init> (Z)V
@@ -615,6 +639,22 @@ public final class io/getstream/chat/android/client/api/models/SendActionRequest
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class io/getstream/chat/android/client/api/models/UpdatePollOptionRequest {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Ljava/util/Map;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lio/getstream/chat/android/client/api/models/UpdatePollOptionRequest;
+	public static synthetic fun copy$default (Lio/getstream/chat/android/client/api/models/UpdatePollOptionRequest;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lio/getstream/chat/android/client/api/models/UpdatePollOptionRequest;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getExtraData ()Ljava/util/Map;
+	public final fun getId ()Ljava/lang/String;
+	public final fun getText ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class io/getstream/chat/android/client/api/models/WatchChannelRequest : io/getstream/chat/android/client/api/models/QueryChannelRequest {
 	public fun <init> ()V
 	public synthetic fun withData (Ljava/util/Map;)Lio/getstream/chat/android/client/api/models/QueryChannelRequest;
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt
index e0739366623..5646510f69c 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt
@@ -30,6 +30,7 @@ import io.getstream.chat.android.client.ChatClient.Companion.MAX_COOLDOWN_TIME_S
 import io.getstream.chat.android.client.api.ChatApi
 import io.getstream.chat.android.client.api.ChatClientConfig
 import io.getstream.chat.android.client.api.ErrorCall
+import io.getstream.chat.android.client.api.models.CreatePollOptionRequest
 import io.getstream.chat.android.client.api.models.GetThreadOptions
 import io.getstream.chat.android.client.api.models.PinnedMessagesPagination
 import io.getstream.chat.android.client.api.models.QueryChannelRequest
@@ -37,6 +38,7 @@ import io.getstream.chat.android.client.api.models.QueryChannelsRequest
 import io.getstream.chat.android.client.api.models.QueryThreadsRequest
 import io.getstream.chat.android.client.api.models.QueryUsersRequest
 import io.getstream.chat.android.client.api.models.SendActionRequest
+import io.getstream.chat.android.client.api.models.UpdatePollOptionRequest
 import io.getstream.chat.android.client.api.models.identifier.AddDeviceIdentifier
 import io.getstream.chat.android.client.api.models.identifier.ConnectUserIdentifier
 import io.getstream.chat.android.client.api.models.identifier.DeleteDeviceIdentifier
@@ -189,6 +191,8 @@ import io.getstream.chat.android.models.PushMessage
 import io.getstream.chat.android.models.PushPreference
 import io.getstream.chat.android.models.PushPreferenceLevel
 import io.getstream.chat.android.models.QueryDraftsResult
+import io.getstream.chat.android.models.QueryPollVotesResult
+import io.getstream.chat.android.models.QueryPollsResult
 import io.getstream.chat.android.models.QueryRemindersResult
 import io.getstream.chat.android.models.QueryThreadsResult
 import io.getstream.chat.android.models.Reaction
@@ -1727,35 +1731,6 @@ internal constructor(
         )
     }
 
-    /**
-     * Send a message with a poll to the given channel.
-     *
-     * IMPORTANT: Polls cannot be sent inside a thread!
-     *
-     * @param channelType The channel type. ie messaging.
-     * @param channelId The channel id. ie 123.
-     * @param pollConfig The poll configuration.
-     *
-     * @return Executable async [Call] responsible for sending a poll.
-     */
-    @CheckResult
-    public fun sendPoll(
-        channelType: String,
-        channelId: String,
-        pollConfig: PollConfig,
-    ): Call<Message> {
-        return api.createPoll(pollConfig)
-            .flatMap { poll ->
-                sendMessage(
-                    channelType = channelType,
-                    channelId = channelId,
-                    Message(
-                        extraData = mapOf("poll_id" to poll.id),
-                    ),
-                )
-            }
-    }
-
     /**
      * Sends a static location message to the given channel.
      *
@@ -1898,12 +1873,196 @@ internal constructor(
             }
     }
 
+    /**
+     * Send a message with a poll to the given channel.
+     *
+     * IMPORTANT: Polls cannot be sent inside a thread!
+     *
+     * @param channelType The channel type. ie messaging.
+     * @param channelId The channel id. ie 123.
+     * @param pollConfig The poll configuration.
+     *
+     * @return Executable async [Call] responsible for sending a poll.
+     */
+    @CheckResult
+    public fun sendPoll(
+        channelType: String,
+        channelId: String,
+        pollConfig: PollConfig,
+    ): Call<Message> {
+        return api.createPoll(pollConfig)
+            .flatMap { poll ->
+                sendMessage(
+                    channelType = channelType,
+                    channelId = channelId,
+                    Message(
+                        extraData = mapOf("poll_id" to poll.id),
+                    ),
+                )
+            }
+    }
+
+    /**
+     * Get a poll by id.
+     *
+     * @param pollId The poll id.
+     * @return Executable async [Call] responsible for fetching a poll.
+     */
+    @CheckResult
+    public fun getPoll(pollId: String): Call<Poll> {
+        return api.getPoll(pollId)
+    }
+
+    /**
+     * Partially update a poll.
+     *
+     * @param pollId The poll id.
+     * @param set Map of fields to set.
+     * @param unset List of fields to unset.
+     * @return Executable async [Call] responsible for updating a poll.
+     */
+    @CheckResult
+    public fun partialUpdatePoll(
+        pollId: String,
+        set: Map<String, Any> = emptyMap(),
+        unset: List<String> = emptyList(),
+    ): Call<Poll> {
+        return api.partialUpdatePoll(pollId, set, unset)
+    }
+
+    /**
+     * Close a poll in a message.
+     *
+     * @param pollId The poll id.
+     *
+     * @return Executable async [Call] responsible for closing a poll.
+     */
+    @CheckResult
+    public fun closePoll(pollId: String): Call<Poll> {
+        return api.closePoll(pollId)
+    }
+
+    /**
+     * Deletes a poll.
+     *
+     * @param pollId The ID of the poll to delete.
+     * @return Executable async [Call] responsible for deleting a poll.
+     */
+    @CheckResult
+    public fun deletePoll(pollId: String): Call<Unit> {
+        return api.deletePoll(pollId)
+    }
+
+    /**
+     * Create a new option for a poll.
+     * Note: To create an option with custom data, use [createPollOption] instead.
+     *
+     * @param pollId The poll id.
+     * @param option The option to create.
+     *
+     * @return Executable async [Call] responsible for creating a new option.
+     */
+    @Deprecated("ChatClient.suggestPollOption doesn't allow passing custom data. Use createPollOption instead.")
     @CheckResult
     public fun suggestPollOption(
         pollId: String,
         option: String,
     ): Call<Option> {
-        return api.suggestPollOption(pollId, option)
+        val request = CreatePollOptionRequest(option)
+        return createPollOption(pollId, request)
+    }
+
+    /**
+     * Create a new option for a poll.
+     *
+     * @param pollId The poll id.
+     * @param option The option to create.
+     *
+     * @return Executable async [Call] responsible for creating a new option.
+     */
+    @CheckResult
+    public fun createPollOption(
+        pollId: String,
+        option: CreatePollOptionRequest,
+    ): Call<Option> {
+        return api.createPollOption(pollId, option)
+    }
+
+    /**
+     * Update an existing option in a poll.
+     *
+     * @param pollId The poll id.
+     * @param option The option to update.
+     */
+    @CheckResult
+    public fun updatePollOption(
+        pollId: String,
+        option: UpdatePollOptionRequest,
+    ): Call<Option> {
+        return api.updatePollOption(pollId, option)
+    }
+
+    /**
+     * Delete an option from a poll.
+     *
+     * @param pollId The poll id.
+     * @param optionId The option id to delete.
+     *
+     * @return Executable async [Call] responsible for deleting an option.
+     */
+    @CheckResult
+    public fun deletePollOption(pollId: String, optionId: String): Call<Unit> {
+        return api.deletePollOption(pollId, optionId)
+    }
+
+    /**
+     * Query votes for a specific poll with optional filtering, pagination, and sorting.
+     *
+     * @param pollId The poll id.
+     * @param filter The filter conditions to filter the votes. For available fields check
+     * [Votes Queryable Fields](https://getstream.io/chat/docs/android/polls_api/#votes-queryable-built-in-fields).
+     * @param limit The maximum number of votes to return.
+     * @param next The pagination token for fetching the next set of results.
+     * @param sort The sort object for the query: Supported fields:
+     *  - `created_at` Vote creation timestamp
+     *
+     * @return Executable async [Call] responsible for querying votes for a specific poll.
+     */
+    @CheckResult
+    public fun queryPollVotes(
+        pollId: String,
+        filter: FilterObject? = null,
+        limit: Int? = null,
+        next: String? = null,
+        sort: QuerySorter<Vote>? = null,
+    ): Call<QueryPollVotesResult> {
+        return api.queryPollVotes(pollId, filter, limit, next, sort)
+    }
+
+    /**
+     * Query polls with optional filtering, pagination, and sorting.
+     *
+     * @param filter The filter conditions to filter the polls. For available fields check
+     * [Poll Queryable Fields](https://getstream.io/chat/docs/android/polls_api/#poll-queryable-built-in-fields).
+     * @param limit The maximum number of polls to return.
+     * @param next The pagination token for fetching the next set of results.
+     * @param sort The sort object for the query: Supported fields:
+     *  - `id` Unique identifier of the poll
+     *  - `name` Name of the poll
+     *  - `created_at` Poll creation timestamp
+     *  - `updated_at` Poll last update timestamp
+     *  - `is_closed` Whether the poll is closed or not
+     *
+     * @return Executable async [Call] responsible for querying polls.
+     */
+    @CheckResult
+    public fun queryPolls(
+        filter: FilterObject? = null,
+        limit: Int? = null,
+        next: String? = null,
+        sort: QuerySorter<Poll>? = null,
+    ): Call<QueryPollsResult> {
+        return api.queryPolls(filter, limit, next, sort)
     }
 
     /**
@@ -1951,29 +2110,6 @@ internal constructor(
         return api.removePollVote(messageId, pollId, vote.id)
     }
 
-    /**
-     * Close a poll in a message.
-     *
-     * @param pollId The poll id.
-     *
-     * @return Executable async [Call] responsible for closing a poll.
-     */
-    @CheckResult
-    public fun closePoll(pollId: String): Call<Poll> {
-        return api.closePoll(pollId)
-    }
-
-    /**
-     * Deletes a poll.
-     *
-     * @param pollId The ID of the poll to delete.
-     * @return Executable async [Call] responsible for deleting a poll.
-     */
-    @CheckResult
-    public fun deletePoll(pollId: String): Call<Unit> {
-        return api.deletePoll(pollId)
-    }
-
     /**
      * Retrieves the file attachments from the given channel.
      *
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/ChatApi.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/ChatApi.kt
index d2d7469592d..b4e6c1641e4 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/ChatApi.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/ChatApi.kt
@@ -17,6 +17,7 @@
 package io.getstream.chat.android.client.api
 
 import androidx.annotation.CheckResult
+import io.getstream.chat.android.client.api.models.CreatePollOptionRequest
 import io.getstream.chat.android.client.api.models.GetThreadOptions
 import io.getstream.chat.android.client.api.models.PinnedMessagesPagination
 import io.getstream.chat.android.client.api.models.QueryChannelRequest
@@ -24,6 +25,7 @@ import io.getstream.chat.android.client.api.models.QueryChannelsRequest
 import io.getstream.chat.android.client.api.models.QueryThreadsRequest
 import io.getstream.chat.android.client.api.models.QueryUsersRequest
 import io.getstream.chat.android.client.api.models.SendActionRequest
+import io.getstream.chat.android.client.api.models.UpdatePollOptionRequest
 import io.getstream.chat.android.client.events.ChatEvent
 import io.getstream.chat.android.client.utils.ProgressCallback
 import io.getstream.chat.android.models.AppSettings
@@ -50,6 +52,8 @@ import io.getstream.chat.android.models.PollConfig
 import io.getstream.chat.android.models.PushPreference
 import io.getstream.chat.android.models.PushPreferenceLevel
 import io.getstream.chat.android.models.QueryDraftsResult
+import io.getstream.chat.android.models.QueryPollVotesResult
+import io.getstream.chat.android.models.QueryPollsResult
 import io.getstream.chat.android.models.QueryRemindersResult
 import io.getstream.chat.android.models.QueryThreadsResult
 import io.getstream.chat.android.models.Reaction
@@ -576,7 +580,33 @@ internal interface ChatApi {
     fun createPoll(pollConfig: PollConfig): Call<Poll>
 
     @CheckResult
-    fun suggestPollOption(pollId: String, option: String): Call<Option>
+    fun getPoll(pollId: String): Call<Poll>
+
+    @CheckResult
+    fun createPollOption(pollId: String, option: CreatePollOptionRequest): Call<Option>
+
+    @CheckResult
+    fun updatePollOption(pollId: String, option: UpdatePollOptionRequest): Call<Option>
+
+    @CheckResult
+    fun deletePollOption(pollId: String, optionId: String): Call<Unit>
+
+    @CheckResult
+    fun queryPollVotes(
+        pollId: String,
+        filter: FilterObject?,
+        limit: Int?,
+        next: String?,
+        sort: QuerySorter<Vote>?,
+    ): Call<QueryPollVotesResult>
+
+    @CheckResult
+    fun queryPolls(
+        filter: FilterObject?,
+        limit: Int?,
+        next: String?,
+        sort: QuerySorter<Poll>?,
+    ): Call<QueryPollsResult>
 
     @CheckResult
     fun castPollVote(messageId: String, pollId: String, optionId: String): Call<Vote>
@@ -587,6 +617,9 @@ internal interface ChatApi {
     @CheckResult
     fun removePollVote(messageId: String, pollId: String, voteId: String): Call<Vote>
 
+    @CheckResult
+    fun partialUpdatePoll(pollId: String, set: Map<String, Any>, unset: List<String>): Call<Poll>
+
     @CheckResult
     fun closePoll(pollId: String): Call<Poll>
 
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/models/PollRequests.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/models/PollRequests.kt
new file mode 100644
index 00000000000..6f4f5bb5a54
--- /dev/null
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/models/PollRequests.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.api.models
+
+/**
+ * Model holding request data for creating a poll option.
+ *
+ * @param text The text of the poll option.
+ * @param extraData A map of additional key-value pairs to include in the creation request.
+ */
+public data class CreatePollOptionRequest(
+    val text: String,
+    val extraData: Map<String, Any> = emptyMap(),
+)
+
+/**
+ * Model holding request data for updating a poll option.
+ *
+ * @param id The unique identifier of the poll option to be updated.
+ * @param text The new text for the poll option.
+ * @param extraData A map of additional key-value pairs to include in the update request.
+ */
+public data class UpdatePollOptionRequest(
+    val id: String,
+    val text: String,
+    val extraData: Map<String, Any> = emptyMap(),
+)
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/models/QueryThreadsRequest.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/models/QueryThreadsRequest.kt
index bfc59ef5fab..3e509fe8e92 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/models/QueryThreadsRequest.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/models/QueryThreadsRequest.kt
@@ -30,6 +30,7 @@ import io.getstream.chat.android.models.querysort.QuerySorter
  * @property filter The filter object for the query. Supported fields:
  *  - `channel_cid` Filter by channel CID. Supported operators: `$eq`, `$in`
  *  - `channel.disabled` Filter by channel disabled status. Supported operators: `$eq`
+ *  - `channel.team` Filter by channel team. Supported operators: `$eq`, `$in`
  *  - `parent_message_id` Filter by parent message ID. Supported operators: `$eq`, `$in`
  *  - `created_by_user_id` Filter by thread creator’s user ID. Supported operators: `$eq`, `$in`
  *  - `created_at` Filter by thread creation timestamp. Supported operators: `$eq`, `$gt`, `$lt`, `$gte`, `$lte`
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt
index 42f3fe1f161..674bcde423d 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt
@@ -18,12 +18,14 @@ package io.getstream.chat.android.client.api2
 
 import io.getstream.chat.android.client.api.ChatApi
 import io.getstream.chat.android.client.api.ErrorCall
+import io.getstream.chat.android.client.api.models.CreatePollOptionRequest
 import io.getstream.chat.android.client.api.models.GetThreadOptions
 import io.getstream.chat.android.client.api.models.PinnedMessagesPagination
 import io.getstream.chat.android.client.api.models.QueryChannelRequest
 import io.getstream.chat.android.client.api.models.QueryChannelsRequest
 import io.getstream.chat.android.client.api.models.QueryThreadsRequest
 import io.getstream.chat.android.client.api.models.QueryUsersRequest
+import io.getstream.chat.android.client.api.models.UpdatePollOptionRequest
 import io.getstream.chat.android.client.api2.endpoint.ChannelApi
 import io.getstream.chat.android.client.api2.endpoint.ConfigApi
 import io.getstream.chat.android.client.api2.endpoint.DeviceApi
@@ -51,6 +53,7 @@ import io.getstream.chat.android.client.api2.model.requests.AddDeviceRequest
 import io.getstream.chat.android.client.api2.model.requests.AddMembersRequest
 import io.getstream.chat.android.client.api2.model.requests.BanUserRequest
 import io.getstream.chat.android.client.api2.model.requests.BlockUserRequest
+import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
 import io.getstream.chat.android.client.api2.model.requests.FlagMessageRequest
 import io.getstream.chat.android.client.api2.model.requests.FlagRequest
 import io.getstream.chat.android.client.api2.model.requests.FlagUserRequest
@@ -62,15 +65,16 @@ import io.getstream.chat.android.client.api2.model.requests.MarkUnreadRequest
 import io.getstream.chat.android.client.api2.model.requests.MuteChannelRequest
 import io.getstream.chat.android.client.api2.model.requests.MuteUserRequest
 import io.getstream.chat.android.client.api2.model.requests.PartialUpdateMessageRequest
+import io.getstream.chat.android.client.api2.model.requests.PartialUpdatePollRequest
 import io.getstream.chat.android.client.api2.model.requests.PartialUpdateThreadRequest
 import io.getstream.chat.android.client.api2.model.requests.PartialUpdateUsersRequest
 import io.getstream.chat.android.client.api2.model.requests.PinnedMessagesRequest
-import io.getstream.chat.android.client.api2.model.requests.PollRequest
-import io.getstream.chat.android.client.api2.model.requests.PollUpdateRequest
 import io.getstream.chat.android.client.api2.model.requests.PollVoteRequest
 import io.getstream.chat.android.client.api2.model.requests.QueryBannedUsersRequest
 import io.getstream.chat.android.client.api2.model.requests.QueryDraftMessagesRequest
 import io.getstream.chat.android.client.api2.model.requests.QueryDraftsRequest
+import io.getstream.chat.android.client.api2.model.requests.QueryPollVotesRequest
+import io.getstream.chat.android.client.api2.model.requests.QueryPollsRequest
 import io.getstream.chat.android.client.api2.model.requests.QueryRemindersRequest
 import io.getstream.chat.android.client.api2.model.requests.ReactionRequest
 import io.getstream.chat.android.client.api2.model.requests.RejectInviteRequest
@@ -79,7 +83,6 @@ import io.getstream.chat.android.client.api2.model.requests.RemoveMembersRequest
 import io.getstream.chat.android.client.api2.model.requests.SendActionRequest
 import io.getstream.chat.android.client.api2.model.requests.SendEventRequest
 import io.getstream.chat.android.client.api2.model.requests.SendMessageRequest
-import io.getstream.chat.android.client.api2.model.requests.SuggestPollOptionRequest
 import io.getstream.chat.android.client.api2.model.requests.SyncHistoryRequest
 import io.getstream.chat.android.client.api2.model.requests.TruncateChannelRequest
 import io.getstream.chat.android.client.api2.model.requests.UnblockUserRequest
@@ -136,6 +139,8 @@ import io.getstream.chat.android.models.PollConfig
 import io.getstream.chat.android.models.PushPreference
 import io.getstream.chat.android.models.PushPreferenceLevel
 import io.getstream.chat.android.models.QueryDraftsResult
+import io.getstream.chat.android.models.QueryPollVotesResult
+import io.getstream.chat.android.models.QueryPollsResult
 import io.getstream.chat.android.models.QueryRemindersResult
 import io.getstream.chat.android.models.QueryThreadsResult
 import io.getstream.chat.android.models.Reaction
@@ -1563,38 +1568,96 @@ constructor(
             voteId,
         ).mapDomain { it.vote.toDomain() }
 
-    override fun closePoll(pollId: String): Call<Poll> =
-        pollsApi.updatePoll(
-            pollId,
-            PollUpdateRequest(
-                set = mapOf("is_closed" to true),
-            ),
-        ).mapDomain { it.poll.toDomain() }
+    override fun partialUpdatePoll(pollId: String, set: Map<String, Any>, unset: List<String>): Call<Poll> {
+        val request = PartialUpdatePollRequest(set, unset)
+        return pollsApi.partialUpdatePoll(pollId, request).mapDomain { it.poll.toDomain() }
+    }
 
-    override fun suggestPollOption(pollId: String, option: String): Call<Option> =
-        pollsApi.suggestPollOption(
-            pollId,
-            SuggestPollOptionRequest(option),
-        ).mapDomain { it.poll_option.toDomain() }
+    override fun closePoll(pollId: String): Call<Poll> {
+        val set = mapOf("is_closed" to true)
+        return partialUpdatePoll(pollId, set, emptyList())
+    }
+
+    override fun createPollOption(pollId: String, option: CreatePollOptionRequest): Call<Option> {
+        val request = io.getstream.chat.android.client.api2.model.requests.CreatePollOptionRequest(
+            text = option.text,
+            extraData = option.extraData,
+        )
+        return pollsApi.createPollOption(pollId, request).mapDomain { it.poll_option.toDomain() }
+    }
+
+    override fun updatePollOption(pollId: String, option: UpdatePollOptionRequest): Call<Option> {
+        val request = io.getstream.chat.android.client.api2.model.requests.UpdatePollOptionRequest(
+            id = option.id,
+            text = option.text,
+            extraData = option.extraData,
+        )
+        return pollsApi.updatePollOption(pollId, request).mapDomain { it.poll_option.toDomain() }
+    }
+
+    override fun deletePollOption(pollId: String, optionId: String): Call<Unit> {
+        return pollsApi.deletePollOption(pollId, optionId).toUnitCall()
+    }
+
+    override fun queryPollVotes(
+        pollId: String,
+        filter: FilterObject?,
+        limit: Int?,
+        next: String?,
+        sort: QuerySorter<Vote>?,
+    ): Call<QueryPollVotesResult> {
+        val request = QueryPollVotesRequest(
+            filter = filter?.toMap(),
+            limit = limit,
+            next = next,
+            sort = sort?.toDto(),
+        )
+        return pollsApi.queryPollVotes(pollId, request).mapDomain { it.toDomain() }
+    }
+
+    override fun queryPolls(
+        filter: FilterObject?,
+        limit: Int?,
+        next: String?,
+        sort: QuerySorter<Poll>?,
+    ): Call<QueryPollsResult> {
+        val request = QueryPollsRequest(
+            filter = filter?.toMap(),
+            limit = limit,
+            next = next,
+            sort = sort?.toDto(),
+        )
+        return pollsApi.queryPolls(request).mapDomain { it.toDomain() }
+    }
 
     override fun createPoll(pollConfig: PollConfig): Call<Poll> {
         return pollsApi.createPoll(
-            PollRequest(
-                name = pollConfig.name,
+            CreatePollRequest(
+                allow_answers = pollConfig.allowAnswers,
+                allow_user_suggested_options = pollConfig.allowUserSuggestedOptions,
                 description = pollConfig.description,
-                options = pollConfig.options.map(::UpstreamOptionDto),
-                voting_visibility = when (pollConfig.votingVisibility) {
-                    VotingVisibility.PUBLIC -> PollRequest.VOTING_VISIBILITY_PUBLIC
-                    VotingVisibility.ANONYMOUS -> PollRequest.VOTING_VISIBILITY_ANONYMOUS
-                },
                 enforce_unique_vote = pollConfig.enforceUniqueVote,
                 max_votes_allowed = pollConfig.maxVotesAllowed,
-                allow_user_suggested_options = pollConfig.allowUserSuggestedOptions,
-                allow_answers = pollConfig.allowAnswers,
+                name = pollConfig.name,
+                options = pollConfig.optionsWithExtraData.map {
+                    UpstreamOptionDto(
+                        text = it.text,
+                        extraData = it.extraData,
+                    )
+                },
+                voting_visibility = when (pollConfig.votingVisibility) {
+                    VotingVisibility.PUBLIC -> CreatePollRequest.VOTING_VISIBILITY_PUBLIC
+                    VotingVisibility.ANONYMOUS -> CreatePollRequest.VOTING_VISIBILITY_ANONYMOUS
+                },
+                extraData = pollConfig.extraData,
             ),
         ).mapDomain { it.poll.toDomain() }
     }
 
+    override fun getPoll(pollId: String): Call<Poll> {
+        return pollsApi.getPoll(pollId).mapDomain { it.poll.toDomain() }
+    }
+
     override fun deletePoll(pollId: String): Call<Unit> {
         return pollsApi.deletePoll(pollId).toUnitCall()
     }
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/PollsApi.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/PollsApi.kt
index 8212835103e..cdf89b312d3 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/PollsApi.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/PollsApi.kt
@@ -17,51 +17,160 @@
 package io.getstream.chat.android.client.api2.endpoint
 
 import io.getstream.chat.android.client.api.AuthenticatedApi
-import io.getstream.chat.android.client.api2.model.requests.PollRequest
-import io.getstream.chat.android.client.api2.model.requests.PollUpdateRequest
+import io.getstream.chat.android.client.api2.model.requests.CreatePollOptionRequest
+import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
+import io.getstream.chat.android.client.api2.model.requests.PartialUpdatePollRequest
 import io.getstream.chat.android.client.api2.model.requests.PollVoteRequest
-import io.getstream.chat.android.client.api2.model.requests.SuggestPollOptionRequest
+import io.getstream.chat.android.client.api2.model.requests.QueryPollVotesRequest
+import io.getstream.chat.android.client.api2.model.requests.QueryPollsRequest
+import io.getstream.chat.android.client.api2.model.requests.UpdatePollOptionRequest
 import io.getstream.chat.android.client.api2.model.response.CompletableResponse
+import io.getstream.chat.android.client.api2.model.response.PollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.PollResponse
 import io.getstream.chat.android.client.api2.model.response.PollVoteResponse
-import io.getstream.chat.android.client.api2.model.response.SuggestPollOptionResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollVotesResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollsResponse
 import io.getstream.chat.android.client.call.RetrofitCall
 import retrofit2.http.Body
 import retrofit2.http.DELETE
+import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
+import retrofit2.http.PUT
 import retrofit2.http.Path
 
+/**
+ * Retrofit interface defining the Polls API.
+ */
+@Suppress("TooManyFunctions")
 @AuthenticatedApi
 internal interface PollsApi {
 
     /**
      * Creates a new poll.
      *
-     * @param pollRequest The poll request.
+     * See [Create poll](https://getstream.github.io/protocol/#/product%3Achat/CreatePoll).
+     *
+     * @param body Body holding the poll properties to be created.
      *
      * @return The poll response.
      */
     @POST("/polls")
-    fun createPoll(@Body pollRequest: PollRequest): RetrofitCall<PollResponse>
+    fun createPoll(@Body body: CreatePollRequest): RetrofitCall<PollResponse>
+
+    /**
+     * Deletes a poll.
+     *
+     * See [Delete poll](https://getstream.github.io/protocol/#/product%3Achat/DeletePoll).
+     *
+     * @param pollId The ID of the poll to delete.
+     */
+    @DELETE("/polls/{poll_id}")
+    fun deletePoll(@Path("poll_id") pollId: String): RetrofitCall<CompletableResponse>
+
+    /**
+     * Retrieves a poll by its ID.
+     *
+     * See [Get poll](https://getstream.github.io/protocol/#/product%3Achat/GetPoll).
+     *
+     * @param pollId The poll ID.
+     *
+     * @return The poll response.
+     */
+    @GET("/polls/{poll_id}")
+    fun getPoll(@Path("poll_id") pollId: String): RetrofitCall<PollResponse>
+
+    /**
+     * Updates a poll.
+     *
+     * See [Partial update poll](https://getstream.github.io/protocol/#/product%3Achat/UpdatePollPartial).
+     *
+     * @param pollId The poll ID.
+     * @param body The poll update request.
+     *
+     * @return The poll response.
+     */
+    @PATCH("/polls/{poll_id}")
+    fun partialUpdatePoll(
+        @Path("poll_id") pollId: String,
+        @Body body: PartialUpdatePollRequest,
+    ): RetrofitCall<PollResponse>
 
     /**
-     * Suggest a new option for a poll.
+     * Create a new option for a poll.
+     *
+     * See [Create poll option](https://getstream.github.io/protocol/#/product%3Achat/CreatePollOption).
      *
      * @param pollId The poll ID.
-     * @param suggestPollOptionRequest The suggest poll option request.
+     * @param body The create poll option request.
      *
      * @return The suggest poll option response.
      */
     @POST("/polls/{poll_id}/options")
-    fun suggestPollOption(
+    fun createPollOption(
+        @Path("poll_id") pollId: String,
+        @Body body: CreatePollOptionRequest,
+    ): RetrofitCall<PollOptionResponse>
+
+    /**
+     * Update an option for a poll.
+     *
+     * See [Update poll option](https://getstream.github.io/protocol/#/product%3Achat/UpdatePollOption).
+     *
+     * @param pollId The poll ID.
+     * @param body The update poll option request.
+     */
+    @PUT("/polls/{poll_id}/options")
+    fun updatePollOption(
+        @Path("poll_id") pollId: String,
+        @Body body: UpdatePollOptionRequest,
+    ): RetrofitCall<PollOptionResponse>
+
+    /**
+     * Deletes an option from a poll.
+     *
+     * See [Delete poll option](https://getstream.github.io/protocol/#/product%3Achat/DeletePollOption).
+     *
+     * @param pollId The poll ID.
+     * @param optionId The option ID.
+     */
+    @DELETE("/polls/{poll_id}/options/{option_id}")
+    fun deletePollOption(
+        @Path("poll_id") pollId: String,
+        @Path("option_id") optionId: String,
+    ): RetrofitCall<CompletableResponse>
+
+    // MISSING: Get poll option
+
+    /**
+     * Queries votes for a specific poll based on the provided criteria.
+     *
+     * See: [Query poll votes](https://getstream.github.io/protocol/#/product%3Achat/QueryPollVotes).
+     *
+     * @param pollId The poll ID.
+     * @param body The query poll votes request.
+     */
+    @POST("/polls/{poll_id}/votes")
+    fun queryPollVotes(
         @Path("poll_id") pollId: String,
-        @Body suggestPollOptionRequest: SuggestPollOptionRequest,
-    ): RetrofitCall<SuggestPollOptionResponse>
+        @Body body: QueryPollVotesRequest,
+    ): RetrofitCall<QueryPollVotesResponse>
+
+    /**
+     * Queries polls based on the provided criteria.
+     *
+     * See: [Query polls](https://getstream.github.io/protocol/#/product%3Achat/QueryPolls).
+     *
+     * @param body The query polls request.
+     */
+    @POST("/polls/query")
+    fun queryPolls(@Body body: QueryPollsRequest): RetrofitCall<QueryPollsResponse>
 
     /**
      * Casts a vote on a poll.
      *
+     * See: [Cast poll vote](https://getstream.github.io/protocol/#/product%3Achat/CastPollVote).
+     *
      * @param messageId The message ID.
      * @param pollId The poll ID.
      * @param pollVoteRequest The poll vote request.
@@ -76,7 +185,9 @@ internal interface PollsApi {
     ): RetrofitCall<PollVoteResponse>
 
     /**
-     * Removes a vote on a poll.
+     * Deletes a vote on a poll.
+     *
+     * See: [Delete poll vote](https://getstream.github.io/protocol/#/product%3Achat/DeletePollVote).
      *
      * @param messageId The message ID.
      * @param pollId The poll ID.
@@ -90,26 +201,4 @@ internal interface PollsApi {
         @Path("poll_id") pollId: String,
         @Path("vote_id") voteId: String,
     ): RetrofitCall<PollVoteResponse>
-
-    /**
-     * Updates a poll.
-     *
-     * @param pollId The poll ID.
-     * @param pollUpdateRequest The poll update request.
-     *
-     * @return The poll response.
-     */
-    @PATCH("/polls/{poll_id}")
-    fun updatePoll(
-        @Path("poll_id") pollId: String,
-        @Body pollUpdateRequest: PollUpdateRequest,
-    ): RetrofitCall<PollResponse>
-
-    /**
-     * Deletes a poll.
-     *
-     * @param pollId The ID of the poll to delete.
-     */
-    @DELETE("/polls/{poll_id}")
-    fun deletePoll(@Path("poll_id") pollId: String): RetrofitCall<CompletableResponse>
 }
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt
index 8898ced4226..6f7c223d978 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt
@@ -35,9 +35,9 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDetailsDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamMuteDto
-import io.getstream.chat.android.client.api2.model.dto.DownstreamOptionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPendingMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPollDto
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollOptionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionGroupDto
@@ -63,6 +63,8 @@ import io.getstream.chat.android.client.api2.model.response.BannedUserResponse
 import io.getstream.chat.android.client.api2.model.response.BlockUserResponse
 import io.getstream.chat.android.client.api2.model.response.FileUploadConfigDto
 import io.getstream.chat.android.client.api2.model.response.MessageResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollVotesResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollsResponse
 import io.getstream.chat.android.client.api2.model.response.QueryRemindersResponse
 import io.getstream.chat.android.client.extensions.syncUnreadCountWithReads
 import io.getstream.chat.android.core.internal.StreamHandsOff
@@ -99,6 +101,8 @@ import io.getstream.chat.android.models.Poll
 import io.getstream.chat.android.models.PushPreference
 import io.getstream.chat.android.models.PushPreferenceLevel
 import io.getstream.chat.android.models.PushProvider
+import io.getstream.chat.android.models.QueryPollVotesResult
+import io.getstream.chat.android.models.QueryPollsResult
 import io.getstream.chat.android.models.QueryRemindersResult
 import io.getstream.chat.android.models.Reaction
 import io.getstream.chat.android.models.ReactionGroup
@@ -437,7 +441,7 @@ internal class DomainMapping(
             .values
             .toList()
 
-        val answer = latest_answers?.map { it.toAnswerDomain() } ?: emptyList()
+        val answers = latest_answers?.map { it.toAnswerDomain() } ?: emptyList()
 
         return Poll(
             id = id,
@@ -449,13 +453,17 @@ internal class DomainMapping(
             maxVotesAllowed = max_votes_allowed ?: 1,
             allowUserSuggestedOptions = allow_user_suggested_options,
             allowAnswers = allow_answers,
+            voteCount = vote_count,
             voteCountsByOption = vote_counts_by_option ?: emptyMap(),
             votes = votes,
             ownVotes = ownVotes,
             createdAt = created_at,
             updatedAt = updated_at,
-            closed = is_closed,
-            answers = answer,
+            closed = is_closed ?: false,
+            answersCount = answers_count,
+            answers = answers,
+            createdBy = created_by?.toDomain(),
+            extraData = extraData ?: emptyMap(),
         )
     }
 
@@ -464,9 +472,10 @@ internal class DomainMapping(
      *
      * @return Option
      */
-    internal fun DownstreamOptionDto.toDomain(): Option = Option(
+    internal fun DownstreamPollOptionDto.toDomain(): Option = Option(
         id = id,
         text = text,
+        extraData = extraData ?: emptyMap(),
     )
 
     /**
@@ -511,6 +520,22 @@ internal class DomainMapping(
         else -> throw IllegalArgumentException("Unknown voting visibility: $this")
     }
 
+    /**
+     * Transforms [DownstreamPushPreferenceDto] to [PushPreference].
+     */
+    internal fun QueryPollVotesResponse.toDomain(): QueryPollVotesResult = QueryPollVotesResult(
+        votes = votes.map { it.toDomain() },
+        next = next,
+    )
+
+    /**
+     * Transforms the network [QueryPollsResponse] to a domain [QueryPollsResult].
+     */
+    internal fun QueryPollsResponse.toDomain(): QueryPollsResult = QueryPollsResult(
+        polls = polls.map { it.toDomain() },
+        next = next,
+    )
+
     /**
      * Transform [DownstreamChannelUserRead] to [ChannelUserRead].
      *
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/PollsDtos.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/PollsDtos.kt
index c17605cb293..a90e8dcd7a2 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/PollsDtos.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/PollsDtos.kt
@@ -24,12 +24,14 @@ import java.util.Date
  *
  * @property id The id of the option.
  * @property text The text of the option.
+ * @property extraData Any extra data associated with the option.
  */
 @JsonClass(generateAdapter = true)
-internal data class DownstreamOptionDto(
+internal data class DownstreamPollOptionDto(
     val id: String,
     val text: String,
-)
+    val extraData: Map<String, Any>?,
+) : ExtraDataDto
 
 /**
  * Represents the DTO for a vote in a poll.
@@ -58,44 +60,49 @@ internal data class DownstreamVoteDto(
 /**
  * Represents the DTO for a poll.
  *
- * @property id The id of the poll.
- * @property name The name of the poll.
- * @property description The description of the poll.
- * @property voting_visibility The visibility of the votes in the poll. Can be "public" or "anonymous".
- * @property enforce_unique_vote Whether the poll enforces unique votes.
- * @property max_votes_allowed The maximum number of votes allowed in the poll.
- * @property allow_user_suggested_options Whether the poll allows user suggested options.
  * @property allow_answers Whether the poll allows answers.
- * @property options The options in the poll.
- * @property vote_counts_by_option The vote counts for each option in the poll.
- * @property latest_votes_by_option The latest votes for each option in the poll.
+ * @property allow_user_suggested_options Whether the poll allows user suggested options.
+ * @property answers_count The total number of answers in the poll.
  * @property created_at The date when the poll was created.
  * @property created_by The user who created the poll.
  * @property created_by_id The id of the user who created the poll.
+ * @property description The description of the poll.
+ * @property enforce_unique_vote Whether the poll enforces unique votes.
+ * @property id The id of the poll.
+ * @property is_closed Whether the poll is closed.
+ * @property latest_answers The latest answers in the poll.
+ * @property latest_votes_by_option The latest votes for each option in the poll.
+ * @property max_votes_allowed The maximum number of votes allowed in the poll.
+ * @property name The name of the poll.
+ * @property options The options in the poll.
  * @property own_votes The votes of the user who requested the poll.
  * @property updated_at The date when the poll was last updated.
  * @property vote_count The total number of votes in the poll.
- * @property is_closed Whether the poll is closed.
+ * @property vote_counts_by_option The vote counts for each option in the poll.
+ * @property voting_visibility The visibility of the votes in the poll. Can be "public" or "anonymous".
+ * @property extraData Any extra data associated with the poll.
  */
 @JsonClass(generateAdapter = true)
 internal data class DownstreamPollDto(
-    val id: String,
-    val name: String,
-    val description: String,
-    val voting_visibility: String?,
-    val enforce_unique_vote: Boolean,
-    val max_votes_allowed: Int?,
-    val allow_user_suggested_options: Boolean,
     val allow_answers: Boolean,
-    val options: List<DownstreamOptionDto>,
-    val vote_counts_by_option: Map<String, Int>?,
-    val latest_votes_by_option: Map<String, List<DownstreamVoteDto>>?,
-    val latest_answers: List<DownstreamVoteDto>?,
+    val allow_user_suggested_options: Boolean,
+    val answers_count: Int,
     val created_at: Date,
     val created_by: DownstreamUserDto?,
     val created_by_id: String,
+    val description: String,
+    val enforce_unique_vote: Boolean,
+    val id: String,
+    val is_closed: Boolean?,
+    val latest_answers: List<DownstreamVoteDto>?,
+    val latest_votes_by_option: Map<String, List<DownstreamVoteDto>>?,
+    val max_votes_allowed: Int?,
+    val name: String,
+    val options: List<DownstreamPollOptionDto>,
     val own_votes: List<DownstreamVoteDto>,
     val updated_at: Date,
     val vote_count: Int,
-    val is_closed: Boolean = false,
-)
+    val vote_counts_by_option: Map<String, Int>?,
+    val voting_visibility: String?,
+    val extraData: Map<String, Any>?,
+) : ExtraDataDto
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/PollsRequest.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/PollRequests.kt
similarity index 56%
rename from stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/PollsRequest.kt
rename to stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/PollRequests.kt
index 835570b6180..bd3e2619514 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/PollsRequest.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/PollRequests.kt
@@ -17,55 +17,77 @@
 package io.getstream.chat.android.client.api2.model.requests
 
 import com.squareup.moshi.JsonClass
+import io.getstream.chat.android.client.api2.model.dto.ExtraDataDto
+
+/**
+ * Request body for creating a new poll.
+ *
+ * @property allow_answers Indicates whether users can suggest user defined answers.
+ * @property allow_user_suggested_options Indicates whether users can suggest new options.
+ * @property description A description of the poll.
+ * @property enforce_unique_vote Indicates whether users can cast multiple votes.
+ * @property max_votes_allowed Indicates the maximum amount of votes a user can cast.
+ * @property name The name of the poll.
+ * @property options The list of options for the poll.
+ * @property voting_visibility The visibility of the poll. Accepted values are "public" and "anonymous".
+ * @property extraData Any additional custom fields.
+ */
+@JsonClass(generateAdapter = true)
+internal data class CreatePollRequest(
+    val allow_answers: Boolean,
+    val allow_user_suggested_options: Boolean,
+    val description: String,
+    val enforce_unique_vote: Boolean,
+    val max_votes_allowed: Int,
+    val name: String,
+    val options: List<UpstreamOptionDto>,
+    val voting_visibility: String,
+    val extraData: Map<String, Any>,
+) : ExtraDataDto {
+
+    internal companion object {
+        internal const val VOTING_VISIBILITY_PUBLIC = "public"
+        internal const val VOTING_VISIBILITY_ANONYMOUS = "anonymous"
+    }
+}
 
 /**
  * Used for creating a new poll.
  *
  * @property text the text of the option.
+ * @property extraData any additional custom fields.
  */
 @JsonClass(generateAdapter = true)
 internal data class UpstreamOptionDto(
     val text: String,
-)
+    val extraData: Map<String, Any>,
+) : ExtraDataDto
 
 /**
- * Used for creating a new poll.
+ * Used for creating a new poll option.
  *
- * @property name the name of the poll.
- * @property description the description of the poll.
- * @property options the list of options for the poll.
- * @property voting_visibility the visibility of the poll. Accepted values are "public" and "anonymous".
- * @property enforce_unique_vote Indicates whether users can cast multiple votes.
- * @property max_votes_allowed the maximum number of votes allowed per user. min: 1, max: 10
- * @property allow_user_suggested_options Indicates whether users can suggest new options.
+ * @property text the text of the option.
+ * @property extraData any additional custom fields.
  */
 @JsonClass(generateAdapter = true)
-internal data class PollRequest(
-    val name: String,
-    val description: String,
-    val options: List<UpstreamOptionDto>,
-    val voting_visibility: String,
-    val enforce_unique_vote: Boolean,
-    val max_votes_allowed: Int,
-    val allow_user_suggested_options: Boolean,
-    val allow_answers: Boolean,
-) {
-
-    companion object {
-        const val VOTING_VISIBILITY_PUBLIC = "public"
-        const val VOTING_VISIBILITY_ANONYMOUS = "anonymous"
-    }
-}
+internal data class CreatePollOptionRequest(
+    val text: String,
+    val extraData: Map<String, Any>,
+) : ExtraDataDto
 
 /**
- * Used for suggesting a new option for a poll.
+ * Used for updating an existing poll option.
  *
- * @property poll_option the option object.
+ * @property id the id of the option to update.
+ * @property text the new text of the option.
+ * @property extraData any additional custom fields.
  */
 @JsonClass(generateAdapter = true)
-internal data class SuggestPollOptionRequest(
+internal data class UpdatePollOptionRequest(
+    val id: String,
     val text: String,
-)
+    val extraData: Map<String, Any>,
+) : ExtraDataDto
 
 /**
  * Used for voting on a poll.
@@ -84,9 +106,9 @@ internal data class PollVoteRequest(
  * @property unset the fields to unset.
  */
 @JsonClass(generateAdapter = true)
-internal data class PollUpdateRequest(
+internal data class PartialUpdatePollRequest(
     val set: Map<String, Any> = emptyMap(),
-    val unset: Set<String> = emptySet(),
+    val unset: List<String> = emptyList(),
 )
 
 /**
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/QueryPollVotesRequest.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/QueryPollVotesRequest.kt
new file mode 100644
index 00000000000..14b08f029d0
--- /dev/null
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/QueryPollVotesRequest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.api2.model.requests
+
+import com.squareup.moshi.JsonClass
+
+/**
+ * Used for querying poll votes.
+ * @see [io.getstream.chat.android.client.api2.endpoint.PollsApi.queryPollVotes]
+ *
+ * @param filter The filter conditions for the query.
+ * @param sort The sort conditions for the query.
+ * @param limit The number of poll votes to return.
+ * @param next The next pagination token. This token can be used to fetch the next page of poll votes.
+ */
+@JsonClass(generateAdapter = true)
+internal data class QueryPollVotesRequest(
+    val filter: Map<*, *>? = null,
+    val limit: Int? = null,
+    val next: String? = null,
+    val sort: List<Map<String, Any>>? = null,
+)
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/QueryPollsRequest.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/QueryPollsRequest.kt
new file mode 100644
index 00000000000..a46e88bcdd2
--- /dev/null
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/QueryPollsRequest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.api2.model.requests
+
+import com.squareup.moshi.JsonClass
+
+/**
+ * Used for querying polls.
+ * @see [io.getstream.chat.android.client.api2.endpoint.PollsApi.queryPolls]
+ *
+ * @param filter The filter conditions for the query.
+ * @param sort The sort conditions for the query.
+ * @param limit The number of polls to return.
+ * @param next The next pagination token. This token can be used to fetch the next page of polls.
+ */
+@JsonClass(generateAdapter = true)
+internal data class QueryPollsRequest(
+    val filter: Map<*, *>? = null,
+    val limit: Int? = null,
+    val next: String? = null,
+    val sort: List<Map<String, Any>>? = null,
+)
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/SuggestPollOptionResponse.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/PollOptionResponse.kt
similarity index 71%
rename from stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/SuggestPollOptionResponse.kt
rename to stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/PollOptionResponse.kt
index bc461d9617c..028205c38b6 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/SuggestPollOptionResponse.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/PollOptionResponse.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2024 Stream.io Inc. All rights reserved.
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
  *
  * Licensed under the Stream License;
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,16 @@
 package io.getstream.chat.android.client.api2.model.response
 
 import com.squareup.moshi.JsonClass
-import io.getstream.chat.android.client.api2.model.dto.DownstreamOptionDto
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollOptionDto
 
 /**
- * Response for suggesting a new option for a poll.
+ * Response for creating/updating a poll option.
  *
- * @property duration The duration of the request.
- * @property poll_option The option object.
+ * @param duration The duration of the request.
+ * @param poll_option The poll option object.
  */
 @JsonClass(generateAdapter = true)
-internal data class SuggestPollOptionResponse(
+internal data class PollOptionResponse(
     val duration: String,
-    val poll_option: DownstreamOptionDto,
+    val poll_option: DownstreamPollOptionDto,
 )
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/QueryPollVotesResponse.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/QueryPollVotesResponse.kt
new file mode 100644
index 00000000000..18e293f95b1
--- /dev/null
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/QueryPollVotesResponse.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.api2.model.response
+
+import com.squareup.moshi.JsonClass
+import io.getstream.chat.android.client.api2.model.dto.DownstreamVoteDto
+
+/**
+ * Response for [io.getstream.chat.android.client.api2.endpoint.PollsApi.queryPollVotes]
+ *
+ * @param next The identifier for the next page of poll votes.
+ * @param prev The identifier for the previous page of poll votes.
+ * @param votes The list of poll votes.
+ */
+@JsonClass(generateAdapter = true)
+internal data class QueryPollVotesResponse(
+    val next: String?,
+    val prev: String?,
+    val votes: List<DownstreamVoteDto>,
+)
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/QueryPollsResponse.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/QueryPollsResponse.kt
new file mode 100644
index 00000000000..51a3af96557
--- /dev/null
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/QueryPollsResponse.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.api2.model.response
+
+import com.squareup.moshi.JsonClass
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollDto
+
+/**
+ * Response for [io.getstream.chat.android.client.api2.endpoint.PollsApi.queryPolls]
+ *
+ * @param polls The list of polls.
+ * @param next The identifier for the next page of polls.
+ * @param prev The identifier for the previous page of polls.
+ */
+@JsonClass(generateAdapter = true)
+internal data class QueryPollsResponse(
+    val polls: List<DownstreamPollDto>,
+    val next: String?,
+    val prev: String?,
+)
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt
index d33b66060f2..6dc93ed889f 100644
--- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt
@@ -31,21 +31,27 @@ import io.getstream.chat.android.client.events.ConnectedEvent
 import io.getstream.chat.android.client.extensions.internal.enrichIfNeeded
 import io.getstream.chat.android.client.parser.ChatParser
 import io.getstream.chat.android.client.parser2.adapters.AttachmentDtoAdapter
+import io.getstream.chat.android.client.parser2.adapters.CreatePollOptionRequestAdapter
+import io.getstream.chat.android.client.parser2.adapters.CreatePollRequestAdapter
 import io.getstream.chat.android.client.parser2.adapters.DateAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamChannelDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamMemberDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamMessageDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamModerationDetailsDtoAdapter
+import io.getstream.chat.android.client.parser2.adapters.DownstreamPollDtoAdapter
+import io.getstream.chat.android.client.parser2.adapters.DownstreamPollOptionDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamReactionDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamThreadDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamThreadInfoDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.DownstreamUserDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.EventAdapterFactory
 import io.getstream.chat.android.client.parser2.adapters.ExactDateAdapter
+import io.getstream.chat.android.client.parser2.adapters.UpdatePollOptionRequestAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpstreamChannelDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpstreamMemberDataDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpstreamMemberDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpstreamMessageDtoAdapter
+import io.getstream.chat.android.client.parser2.adapters.UpstreamOptionDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpstreamReactionDtoAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpstreamUserDtoAdapter
 import io.getstream.chat.android.client.socket.ErrorResponse
@@ -79,6 +85,12 @@ internal class MoshiChatParser(
             .add(FlagRequestAdapterFactory)
             .add(DownstreamThreadDtoAdapter)
             .add(DownstreamThreadInfoDtoAdapter)
+            .add(DownstreamPollDtoAdapter)
+            .add(DownstreamPollOptionDtoAdapter)
+            .add(CreatePollRequestAdapter)
+            .add(CreatePollOptionRequestAdapter)
+            .add(UpdatePollOptionRequestAdapter)
+            .add(UpstreamOptionDtoAdapter)
             .build()
     }
 
diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/PollDtoAdapters.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/PollDtoAdapters.kt
new file mode 100644
index 00000000000..2bcc8009635
--- /dev/null
+++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/PollDtoAdapters.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.parser2.adapters
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollDto
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollOptionDto
+import io.getstream.chat.android.client.api2.model.requests.CreatePollOptionRequest
+import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
+import io.getstream.chat.android.client.api2.model.requests.UpdatePollOptionRequest
+import io.getstream.chat.android.client.api2.model.requests.UpstreamOptionDto
+
+/**
+ * Deserializer for [DownstreamPollDto] that handles the [io.getstream.chat.android.client.api2.model.dto.ExtraDataDto]
+ * implementation.
+ */
+internal object DownstreamPollDtoAdapter : CustomObjectDtoAdapter<DownstreamPollDto>(DownstreamPollDto::class) {
+
+    @FromJson
+    fun fromJson(
+        jsonReader: JsonReader,
+        mapAdapter: JsonAdapter<MutableMap<String, Any>>,
+        pollAdapter: JsonAdapter<DownstreamPollDto>,
+    ): DownstreamPollDto? = parseWithExtraData(jsonReader, mapAdapter, pollAdapter)
+
+    @ToJson
+    fun toJson(jsonWriter: JsonWriter, value: DownstreamPollDto): Unit = error("Can't convert this to Json")
+}
+
+/**
+ * Deserializer for [DownstreamPollOptionDto] that handles the
+ * [io.getstream.chat.android.client.api2.model.dto.ExtraDataDto] implementation.
+ */
+internal object DownstreamPollOptionDtoAdapter :
+    CustomObjectDtoAdapter<DownstreamPollOptionDto>(DownstreamPollOptionDto::class) {
+
+    @FromJson
+    fun fromJson(
+        jsonReader: JsonReader,
+        mapAdapter: JsonAdapter<MutableMap<String, Any>>,
+        optionAdapter: JsonAdapter<DownstreamPollOptionDto>,
+    ): DownstreamPollOptionDto? = parseWithExtraData(jsonReader, mapAdapter, optionAdapter)
+
+    @ToJson
+    fun toJson(jsonWriter: JsonWriter, value: DownstreamPollOptionDto): Unit = error("Can't convert this to Json")
+}
+
+/**
+ * Serializer for [CreatePollRequest] that handles the [io.getstream.chat.android.client.api2.model.dto.ExtraDataDto]
+ * implementation.
+ */
+internal object CreatePollRequestAdapter : CustomObjectDtoAdapter<CreatePollRequest>(CreatePollRequest::class) {
+
+    @FromJson
+    @Suppress("UNUSED_PARAMETER")
+    fun fromJson(jsonReader: JsonReader): CreatePollRequest = error("Can't parse this from Json")
+
+    @ToJson
+    fun toJson(
+        jsonWriter: JsonWriter,
+        request: CreatePollRequest?,
+        mapAdapter: JsonAdapter<MutableMap<String, Any?>>,
+        requestAdapter: JsonAdapter<CreatePollRequest>,
+    ) = serializeWithExtraData(jsonWriter, request, mapAdapter, requestAdapter)
+}
+
+/**
+ * Serializer for [CreatePollOptionRequest] that handles the
+ * [io.getstream.chat.android.client.api2.model.dto.ExtraDataDto] implementation.
+ */
+internal object CreatePollOptionRequestAdapter :
+    CustomObjectDtoAdapter<CreatePollOptionRequest>(CreatePollOptionRequest::class) {
+
+    @FromJson
+    @Suppress("UNUSED_PARAMETER")
+    fun fromJson(jsonReader: JsonReader): CreatePollOptionRequest = error("Can't parse this from Json")
+
+    @ToJson
+    fun toJson(
+        jsonWriter: JsonWriter,
+        request: CreatePollOptionRequest?,
+        mapAdapter: JsonAdapter<MutableMap<String, Any?>>,
+        requestAdapter: JsonAdapter<CreatePollOptionRequest>,
+    ) = serializeWithExtraData(jsonWriter, request, mapAdapter, requestAdapter)
+}
+
+/**
+ * Serializer for [UpdatePollOptionRequest] that handles the
+ * [io.getstream.chat.android.client.api2.model.dto.ExtraDataDto] implementation.
+ */
+internal object UpdatePollOptionRequestAdapter :
+    CustomObjectDtoAdapter<UpdatePollOptionRequest>(UpdatePollOptionRequest::class) {
+
+    @FromJson
+    @Suppress("UNUSED_PARAMETER")
+    fun fromJson(jsonReader: JsonReader): UpdatePollOptionRequest = error("Can't parse this from Json")
+
+    @ToJson
+    fun toJson(
+        jsonWriter: JsonWriter,
+        request: UpdatePollOptionRequest?,
+        mapAdapter: JsonAdapter<MutableMap<String, Any?>>,
+        requestAdapter: JsonAdapter<UpdatePollOptionRequest>,
+    ) = serializeWithExtraData(jsonWriter, request, mapAdapter, requestAdapter)
+}
+
+/**
+ * Serializer for [UpstreamOptionDto] that handles the [io.getstream.chat.android.client.api2.model.dto.ExtraDataDto]
+ * implementation.
+ */
+internal object UpstreamOptionDtoAdapter :
+    CustomObjectDtoAdapter<UpstreamOptionDto>(UpstreamOptionDto::class) {
+
+    @FromJson
+    @Suppress("UNUSED_PARAMETER")
+    fun fromJson(jsonReader: JsonReader): UpstreamOptionDto = error("Can't parse this from Json")
+
+    @ToJson
+    fun toJson(
+        jsonWriter: JsonWriter,
+        option: UpstreamOptionDto?,
+        mapAdapter: JsonAdapter<MutableMap<String, Any?>>,
+        optionAdapter: JsonAdapter<UpstreamOptionDto>,
+    ) = serializeWithExtraData(jsonWriter, option, mapAdapter, optionAdapter)
+}
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/ChatClientPollsApiTests.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/ChatClientPollsApiTests.kt
index e4e19ec277a..468da5a7174 100644
--- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/ChatClientPollsApiTests.kt
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/ChatClientPollsApiTests.kt
@@ -21,9 +21,12 @@ import io.getstream.chat.android.client.utils.RetroError
 import io.getstream.chat.android.client.utils.RetroSuccess
 import io.getstream.chat.android.client.utils.verifyNetworkError
 import io.getstream.chat.android.client.utils.verifySuccess
+import io.getstream.chat.android.models.Filters
 import io.getstream.chat.android.models.Option
 import io.getstream.chat.android.models.Poll
+import io.getstream.chat.android.models.QueryPollsResult
 import io.getstream.chat.android.models.Vote
+import io.getstream.chat.android.models.querysort.QuerySortByField
 import io.getstream.chat.android.positiveRandomInt
 import io.getstream.chat.android.randomMessage
 import io.getstream.chat.android.randomPoll
@@ -35,6 +38,9 @@ import io.getstream.result.Result
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 
 /**
@@ -77,13 +83,39 @@ internal class ChatClientPollsApiTests : BaseChatClientTest() {
         verifyNetworkError(result, errorCode)
     }
 
+    @Test
+    fun getPollSuccess() = runTest {
+        // given
+        val pollId = randomString()
+        val poll = randomPoll()
+        whenever(api.getPoll(any()))
+            .thenReturn(RetroSuccess(poll).toRetrofitCall())
+        // when
+        val result = chatClient.getPoll(pollId).await()
+        // then
+        verifySuccess(result, poll)
+    }
+
+    @Test
+    fun getPollError() = runTest {
+        // given
+        val pollId = randomString()
+        val errorCode = positiveRandomInt()
+        whenever(api.getPoll(any()))
+            .thenReturn(RetroError<Poll>(errorCode).toRetrofitCall())
+        // when
+        val result = chatClient.getPoll(pollId).await()
+        // then
+        verifyNetworkError(result, errorCode)
+    }
+
     @Test
     fun suggestPollOptionSuccess() = runTest {
         // given
         val pollId = randomString()
         val option = randomString()
         val resultOption = randomPollOption()
-        whenever(api.suggestPollOption(any(), any()))
+        whenever(api.createPollOption(any(), any()))
             .thenReturn(RetroSuccess(resultOption).toRetrofitCall())
         // when
         val result = chatClient.suggestPollOption(pollId, option).await()
@@ -97,7 +129,7 @@ internal class ChatClientPollsApiTests : BaseChatClientTest() {
         val pollId = randomString()
         val option = randomString()
         val errorCode = positiveRandomInt()
-        whenever(api.suggestPollOption(any(), any()))
+        whenever(api.createPollOption(any(), any()))
             .thenReturn(RetroError<Option>(errorCode).toRetrofitCall())
         // when
         val result = chatClient.suggestPollOption(pollId, option).await()
@@ -105,6 +137,62 @@ internal class ChatClientPollsApiTests : BaseChatClientTest() {
         verifyNetworkError(result, errorCode)
     }
 
+    @Test
+    fun createPollOptionSuccess() = runTest {
+        // given
+        val pollId = randomString()
+        val option = Mother.randomCreatePollOptionRequest()
+        val resultOption = randomPollOption()
+        whenever(api.createPollOption(any(), any()))
+            .thenReturn(RetroSuccess(resultOption).toRetrofitCall())
+        // when
+        val result = chatClient.createPollOption(pollId, option).await()
+        // then
+        assert(result.isSuccess)
+    }
+
+    @Test
+    fun createPollOptionError() = runTest {
+        // given
+        val pollId = randomString()
+        val option = Mother.randomCreatePollOptionRequest()
+        val errorCode = positiveRandomInt()
+        whenever(api.createPollOption(any(), any()))
+            .thenReturn(RetroError<Option>(errorCode).toRetrofitCall())
+        // when
+        val result = chatClient.createPollOption(pollId, option).await()
+        // then
+        verifyNetworkError(result, errorCode)
+    }
+
+    @Test
+    fun updatePollOptionSuccess() = runTest {
+        // given
+        val pollId = randomString()
+        val option = Mother.randomUpdatePollOptionRequest()
+        val resultOption = randomPollOption()
+        whenever(api.updatePollOption(any(), any()))
+            .thenReturn(RetroSuccess(resultOption).toRetrofitCall())
+        // when
+        val result = chatClient.updatePollOption(pollId, option).await()
+        // then
+        assert(result.isSuccess)
+    }
+
+    @Test
+    fun updatePollOptionError() = runTest {
+        // given
+        val pollId = randomString()
+        val option = Mother.randomUpdatePollOptionRequest()
+        val errorCode = positiveRandomInt()
+        whenever(api.updatePollOption(any(), any()))
+            .thenReturn(RetroError<Option>(errorCode).toRetrofitCall())
+        // when
+        val result = chatClient.updatePollOption(pollId, option).await()
+        // then
+        verifyNetworkError(result, errorCode)
+    }
+
     @Test
     fun castPollVoteSuccess() = runTest {
         // given
@@ -194,6 +282,51 @@ internal class ChatClientPollsApiTests : BaseChatClientTest() {
         verifyNetworkError(result, errorCode)
     }
 
+    @Test
+    fun partialUpdatePollSuccessWithAllParameters() = runTest {
+        // given
+        val pollId = randomString()
+        val set = mapOf("name" to "New poll name")
+        val unset = listOf("custom_property")
+        val poll = randomPoll()
+        whenever(api.partialUpdatePoll(pollId, set, unset))
+            .thenReturn(RetroSuccess(poll).toRetrofitCall())
+        // when
+        val result = chatClient.partialUpdatePoll(pollId, set, unset).await()
+        // then
+        verifySuccess(result, poll)
+        verify(api).partialUpdatePoll(eq(pollId), eq(set), eq(unset))
+    }
+
+    @Test
+    fun partialUpdatePollSuccessWithMinimalParameters() = runTest {
+        // given
+        val pollId = randomString()
+        val poll = randomPoll()
+        whenever(api.partialUpdatePoll(eq(pollId), eq(emptyMap()), eq(emptyList())))
+            .thenReturn(RetroSuccess(poll).toRetrofitCall())
+        // when
+        val result = chatClient.partialUpdatePoll(pollId).await()
+        // then
+        verifySuccess(result, poll)
+        verify(api).partialUpdatePoll(eq(pollId), eq(emptyMap()), eq(emptyList()))
+    }
+
+    @Test
+    fun partialUpdatePollError() = runTest {
+        // given
+        val pollId = randomString()
+        val set = mapOf("name" to "New poll name")
+        val unset = listOf("custom_property")
+        val errorCode = positiveRandomInt()
+        whenever(api.partialUpdatePoll(pollId, set, unset))
+            .thenReturn(RetroError<Poll>(errorCode).toRetrofitCall())
+        // when
+        val result = chatClient.partialUpdatePoll(pollId, set, unset).await()
+        // then
+        verifyNetworkError(result, errorCode)
+    }
+
     @Test
     fun closePollSuccess() = runTest {
         // given
@@ -220,6 +353,33 @@ internal class ChatClientPollsApiTests : BaseChatClientTest() {
         verifyNetworkError(result, errorCode)
     }
 
+    @Test
+    fun deletePollOptionSuccess() = runTest {
+        // given
+        val pollId = randomString()
+        val optionId = randomString()
+        whenever(api.deletePollOption(any(), any()))
+            .thenReturn(RetroSuccess(Unit).toRetrofitCall())
+        // when
+        val result = chatClient.deletePollOption(pollId, optionId).await()
+        // then
+        verifySuccess(result, Unit)
+    }
+
+    @Test
+    fun deletePollOptionError() = runTest {
+        // given
+        val pollId = randomString()
+        val optionId = randomString()
+        val errorCode = positiveRandomInt()
+        whenever(api.deletePollOption(any(), any()))
+            .thenReturn(RetroError<Unit>(errorCode).toRetrofitCall())
+        // when
+        val result = chatClient.deletePollOption(pollId, optionId).await()
+        // then
+        verifyNetworkError(result, errorCode)
+    }
+
     @Test
     fun deletePollSuccess() = runTest {
         // given
@@ -244,4 +404,115 @@ internal class ChatClientPollsApiTests : BaseChatClientTest() {
         // then
         verifyNetworkError(result, errorCode)
     }
+
+    @Test
+    fun queryPollsSuccessWithAllParameters() = runTest {
+        // given
+        val filter = Filters.eq("is_closed", false)
+        val limit = positiveRandomInt(10)
+        val next = randomString()
+        val sort = QuerySortByField.descByName<Poll>("created_at")
+        val poll1 = randomPoll()
+        val poll2 = randomPoll()
+        val expectedResult = QueryPollsResult(
+            polls = listOf(poll1, poll2),
+            next = randomString(),
+        )
+        whenever(api.queryPolls(any(), any(), any(), any()))
+            .thenReturn(RetroSuccess(expectedResult).toRetrofitCall())
+        // when
+        val result = chatClient.queryPolls(filter, limit, next, sort).await()
+        // then
+        verifySuccess(result, expectedResult)
+        verify(api).queryPolls(eq(filter), eq(limit), eq(next), eq(sort))
+    }
+
+    @Test
+    fun queryPollsSuccessWithMinimalParameters() = runTest {
+        // given
+        val expectedResult = QueryPollsResult(
+            polls = listOf(randomPoll()),
+            next = null,
+        )
+        whenever(api.queryPolls(anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()))
+            .thenReturn(RetroSuccess(expectedResult).toRetrofitCall())
+        // when
+        val result = chatClient.queryPolls().await()
+        // then
+        verifySuccess(result, expectedResult)
+        verify(api).queryPolls(eq(null), eq(null), eq(null), eq(null))
+    }
+
+    @Test
+    fun queryPollsError() = runTest {
+        // given
+        val filter = Filters.eq("is_closed", true)
+        val limit = positiveRandomInt(10)
+        val next = randomString()
+        val sort = QuerySortByField.descByName<Poll>("updated_at")
+        val errorCode = positiveRandomInt()
+        whenever(api.queryPolls(any(), any(), any(), any()))
+            .thenReturn(RetroError<QueryPollsResult>(errorCode).toRetrofitCall())
+        // when
+        val result = chatClient.queryPolls(filter, limit, next, sort).await()
+        // then
+        verifyNetworkError(result, errorCode)
+    }
+
+    @Test
+    fun queryPollVotesSuccessWithAllParameters() = runTest {
+        // given
+        val pollId = randomString()
+        val filter = Filters.eq("user_id", randomString())
+        val limit = positiveRandomInt(10)
+        val next = randomString()
+        val sort = QuerySortByField.descByName<Vote>("created_at")
+        val vote1 = randomPollVote()
+        val vote2 = randomPollVote()
+        val expectedResult = Mother.randomQueryPollVotesResult(
+            votes = listOf(vote1, vote2),
+            next = randomString(),
+        )
+        whenever(api.queryPollVotes(any(), any(), any(), any(), any()))
+            .thenReturn(RetroSuccess(expectedResult).toRetrofitCall())
+        // when
+        val result = chatClient.queryPollVotes(pollId, filter, limit, next, sort).await()
+        // then
+        verifySuccess(result, expectedResult)
+        verify(api).queryPollVotes(eq(pollId), eq(filter), eq(limit), eq(next), eq(sort))
+    }
+
+    @Test
+    fun queryPollVotesSuccessWithMinimalParameters() = runTest {
+        // given
+        val pollId = randomString()
+        val expectedResult = Mother.randomQueryPollVotesResult(
+            votes = listOf(randomPollVote()),
+            next = null,
+        )
+        whenever(api.queryPollVotes(any(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull()))
+            .thenReturn(RetroSuccess(expectedResult).toRetrofitCall())
+        // when
+        val result = chatClient.queryPollVotes(pollId).await()
+        // then
+        verifySuccess(result, expectedResult)
+        verify(api).queryPollVotes(eq(pollId), eq(null), eq(null), eq(null), eq(null))
+    }
+
+    @Test
+    fun queryPollVotesError() = runTest {
+        // given
+        val pollId = randomString()
+        val filter = Filters.eq("option_id", randomString())
+        val limit = positiveRandomInt(10)
+        val next = randomString()
+        val sort = QuerySortByField.descByName<Vote>("updated_at")
+        val errorCode = positiveRandomInt()
+        whenever(api.queryPollVotes(any(), any(), any(), any(), any()))
+            .thenReturn(RetroError<io.getstream.chat.android.models.QueryPollVotesResult>(errorCode).toRetrofitCall())
+        // when
+        val result = chatClient.queryPollVotes(pollId, filter, limit, next, sort).await()
+        // then
+        verifyNetworkError(result, errorCode)
+    }
 }
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt
index 88d6867f63b..ea99161ff7d 100644
--- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt
@@ -16,12 +16,14 @@
 
 package io.getstream.chat.android.client
 
+import io.getstream.chat.android.client.api.models.CreatePollOptionRequest
 import io.getstream.chat.android.client.api.models.GetThreadOptions
 import io.getstream.chat.android.client.api.models.QueryChannelRequest
 import io.getstream.chat.android.client.api.models.QueryChannelsRequest
 import io.getstream.chat.android.client.api.models.QueryThreadsRequest
 import io.getstream.chat.android.client.api.models.QueryUsersRequest
 import io.getstream.chat.android.client.api.models.SendActionRequest
+import io.getstream.chat.android.client.api.models.UpdatePollOptionRequest
 import io.getstream.chat.android.client.api.models.UploadFileResponse
 import io.getstream.chat.android.client.api2.model.dto.AttachmentDto
 import io.getstream.chat.android.client.api2.model.dto.ChannelInfoDto
@@ -40,9 +42,9 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDetailsDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamMuteDto
-import io.getstream.chat.android.client.api2.model.dto.DownstreamOptionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPendingMessageDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPollDto
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollOptionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamReactionGroupDto
@@ -70,6 +72,8 @@ import io.getstream.chat.android.client.api2.model.response.BlockUserResponse
 import io.getstream.chat.android.client.api2.model.response.DraftMessageResponse
 import io.getstream.chat.android.client.api2.model.response.FileUploadConfigDto
 import io.getstream.chat.android.client.api2.model.response.QueryDraftMessagesResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollVotesResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollsResponse
 import io.getstream.chat.android.client.api2.model.response.QueryRemindersResponse
 import io.getstream.chat.android.client.api2.model.response.SocketErrorResponse
 import io.getstream.chat.android.client.api2.model.response.TokenResponse
@@ -89,6 +93,7 @@ import io.getstream.chat.android.models.ConnectionState
 import io.getstream.chat.android.models.FilterObject
 import io.getstream.chat.android.models.Filters
 import io.getstream.chat.android.models.InitializationState
+import io.getstream.chat.android.models.QueryPollVotesResult
 import io.getstream.chat.android.models.User
 import io.getstream.chat.android.models.querysort.QuerySortByField
 import io.getstream.chat.android.models.querysort.QuerySorter
@@ -1037,7 +1042,7 @@ internal object Mother {
         maxVotesAllowed: Int = randomInt(),
         allowUserSuggestedOptions: Boolean = randomBoolean(),
         allowAnswers: Boolean = randomBoolean(),
-        options: List<DownstreamOptionDto> = listOf(randomDownstreamOptionDto()),
+        options: List<DownstreamPollOptionDto> = listOf(randomDownstreamOptionDto()),
         voteCountsByOption: Map<String, Int> = emptyMap(),
         latestVotesByOption: Map<String, List<DownstreamVoteDto>> = emptyMap(),
         latestAnswers: List<DownstreamVoteDto> = listOf(randomAnswerDownstreamVoteDto()),
@@ -1047,7 +1052,9 @@ internal object Mother {
         ownVotes: List<DownstreamVoteDto> = listOf(randomDownstreamVoteDto()),
         updatedAt: Date = randomDate(),
         voteCount: Int = randomInt(),
+        answersCount: Int = randomInt(),
         isClosed: Boolean = randomBoolean(),
+        extraData: Map<String, Any> = randomExtraData(1),
     ): DownstreamPollDto = DownstreamPollDto(
         id = id,
         name = name,
@@ -1067,15 +1074,19 @@ internal object Mother {
         own_votes = ownVotes,
         updated_at = updatedAt,
         vote_count = voteCount,
+        answers_count = answersCount,
         is_closed = isClosed,
+        extraData = extraData,
     )
 
     fun randomDownstreamOptionDto(
         id: String = randomString(),
         text: String = randomString(),
-    ): DownstreamOptionDto = DownstreamOptionDto(
+        extraData: Map<String, Any> = randomExtraData(1),
+    ): DownstreamPollOptionDto = DownstreamPollOptionDto(
         id = id,
         text = text,
+        extraData = extraData,
     )
 
     fun randomDownstreamVoteDto(
@@ -1119,6 +1130,24 @@ internal object Mother {
         answer_text = answerText,
     )
 
+    fun randomCreatePollOptionRequest(
+        text: String = randomString(),
+        extraData: Map<String, Any> = randomExtraData(1),
+    ): CreatePollOptionRequest = CreatePollOptionRequest(
+        text = text,
+        extraData = extraData,
+    )
+
+    fun randomUpdatePollOptionRequest(
+        id: String = randomString(),
+        text: String = randomString(),
+        extraData: Map<String, Any> = randomExtraData(1),
+    ): UpdatePollOptionRequest = UpdatePollOptionRequest(
+        id = id,
+        text = text,
+        extraData = extraData,
+    )
+
     fun randomDownstreamReminderDto(
         channelCid: String = randomString(),
         channel: DownstreamChannelDto = randomDownstreamChannelDto(id = channelCid),
@@ -1145,6 +1174,34 @@ internal object Mother {
         next = next,
     )
 
+    fun randomQueryPollsResponse(
+        polls: List<DownstreamPollDto> = listOf(randomDownstreamPollDto()),
+        next: String? = randomString(),
+        prev: String? = randomString(),
+    ): QueryPollsResponse = QueryPollsResponse(
+        polls = polls,
+        next = next,
+        prev = prev,
+    )
+
+    fun randomQueryPollVotesResponse(
+        votes: List<DownstreamVoteDto> = listOf(randomDownstreamVoteDto()),
+        next: String? = randomString(),
+        prev: String? = randomString(),
+    ): QueryPollVotesResponse = QueryPollVotesResponse(
+        votes = votes,
+        next = next,
+        prev = prev,
+    )
+
+    fun randomQueryPollVotesResult(
+        votes: List<io.getstream.chat.android.models.Vote> = listOf(io.getstream.chat.android.randomPollVote()),
+        next: String? = randomString(),
+    ): QueryPollVotesResult = QueryPollVotesResult(
+        votes = votes,
+        next = next,
+    )
+
     fun randomUploadFileResponse(
         file: String = randomString(),
         thumbUrl: String? = randomString(),
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt
index 71ab28daa76..332705b43e7 100644
--- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt
@@ -17,7 +17,9 @@
 package io.getstream.chat.android.client.api2
 
 import io.getstream.chat.android.client.Mother
+import io.getstream.chat.android.client.api.models.CreatePollOptionRequest
 import io.getstream.chat.android.client.api.models.PinnedMessagesPagination
+import io.getstream.chat.android.client.api.models.UpdatePollOptionRequest
 import io.getstream.chat.android.client.api2.endpoint.ChannelApi
 import io.getstream.chat.android.client.api2.endpoint.ConfigApi
 import io.getstream.chat.android.client.api2.endpoint.DeviceApi
@@ -46,6 +48,7 @@ import io.getstream.chat.android.client.api2.model.requests.AcceptInviteRequest
 import io.getstream.chat.android.client.api2.model.requests.AddDeviceRequest
 import io.getstream.chat.android.client.api2.model.requests.BanUserRequest
 import io.getstream.chat.android.client.api2.model.requests.BlockUserRequest
+import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
 import io.getstream.chat.android.client.api2.model.requests.FlagMessageRequest
 import io.getstream.chat.android.client.api2.model.requests.FlagUserRequest
 import io.getstream.chat.android.client.api2.model.requests.GuestUserRequest
@@ -55,19 +58,19 @@ import io.getstream.chat.android.client.api2.model.requests.MarkUnreadRequest
 import io.getstream.chat.android.client.api2.model.requests.MuteChannelRequest
 import io.getstream.chat.android.client.api2.model.requests.MuteUserRequest
 import io.getstream.chat.android.client.api2.model.requests.PartialUpdateMessageRequest
+import io.getstream.chat.android.client.api2.model.requests.PartialUpdatePollRequest
 import io.getstream.chat.android.client.api2.model.requests.PartialUpdateThreadRequest
 import io.getstream.chat.android.client.api2.model.requests.PartialUpdateUsersRequest
 import io.getstream.chat.android.client.api2.model.requests.PinnedMessagesRequest
-import io.getstream.chat.android.client.api2.model.requests.PollRequest
-import io.getstream.chat.android.client.api2.model.requests.PollUpdateRequest
 import io.getstream.chat.android.client.api2.model.requests.PollVoteRequest
 import io.getstream.chat.android.client.api2.model.requests.QueryBannedUsersRequest
+import io.getstream.chat.android.client.api2.model.requests.QueryPollVotesRequest
+import io.getstream.chat.android.client.api2.model.requests.QueryPollsRequest
 import io.getstream.chat.android.client.api2.model.requests.QueryRemindersRequest
 import io.getstream.chat.android.client.api2.model.requests.RejectInviteRequest
 import io.getstream.chat.android.client.api2.model.requests.ReminderRequest
 import io.getstream.chat.android.client.api2.model.requests.SendActionRequest
 import io.getstream.chat.android.client.api2.model.requests.SendEventRequest
-import io.getstream.chat.android.client.api2.model.requests.SuggestPollOptionRequest
 import io.getstream.chat.android.client.api2.model.requests.UnblockUserRequest
 import io.getstream.chat.android.client.api2.model.requests.UpdateChannelPartialRequest
 import io.getstream.chat.android.client.api2.model.requests.UpdateCooldownRequest
@@ -88,6 +91,7 @@ import io.getstream.chat.android.client.api2.model.response.FlagResponse
 import io.getstream.chat.android.client.api2.model.response.MessageResponse
 import io.getstream.chat.android.client.api2.model.response.MessagesResponse
 import io.getstream.chat.android.client.api2.model.response.MuteUserResponse
+import io.getstream.chat.android.client.api2.model.response.PollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.PollResponse
 import io.getstream.chat.android.client.api2.model.response.PollVoteResponse
 import io.getstream.chat.android.client.api2.model.response.PushPreferencesResponse
@@ -96,13 +100,14 @@ import io.getstream.chat.android.client.api2.model.response.QueryBlockedUsersRes
 import io.getstream.chat.android.client.api2.model.response.QueryChannelsResponse
 import io.getstream.chat.android.client.api2.model.response.QueryDraftMessagesResponse
 import io.getstream.chat.android.client.api2.model.response.QueryMembersResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollVotesResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollsResponse
 import io.getstream.chat.android.client.api2.model.response.QueryRemindersResponse
 import io.getstream.chat.android.client.api2.model.response.QueryThreadsResponse
 import io.getstream.chat.android.client.api2.model.response.ReactionResponse
 import io.getstream.chat.android.client.api2.model.response.ReactionsResponse
 import io.getstream.chat.android.client.api2.model.response.ReminderResponse
 import io.getstream.chat.android.client.api2.model.response.SearchMessagesResponse
-import io.getstream.chat.android.client.api2.model.response.SuggestPollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.SyncHistoryResponse
 import io.getstream.chat.android.client.api2.model.response.ThreadResponse
 import io.getstream.chat.android.client.api2.model.response.TokenResponse
@@ -130,9 +135,11 @@ import io.getstream.chat.android.models.MessageReminder
 import io.getstream.chat.android.models.NoOpChannelTransformer
 import io.getstream.chat.android.models.NoOpMessageTransformer
 import io.getstream.chat.android.models.NoOpUserTransformer
+import io.getstream.chat.android.models.Poll
 import io.getstream.chat.android.models.PushPreferenceLevel
 import io.getstream.chat.android.models.UnreadCounts
 import io.getstream.chat.android.models.UploadedFile
+import io.getstream.chat.android.models.Vote
 import io.getstream.chat.android.models.VotingVisibility
 import io.getstream.chat.android.models.querysort.QuerySortByField
 import io.getstream.chat.android.positiveRandomInt
@@ -142,6 +149,7 @@ import io.getstream.chat.android.randomChatNetworkError
 import io.getstream.chat.android.randomDate
 import io.getstream.chat.android.randomDevice
 import io.getstream.chat.android.randomDraftMessage
+import io.getstream.chat.android.randomExtraData
 import io.getstream.chat.android.randomFile
 import io.getstream.chat.android.randomInt
 import io.getstream.chat.android.randomMember
@@ -2140,12 +2148,32 @@ internal class MoshiChatApiTest {
         verify(api, times(1)).removePollVote(messageId, pollId, voteId)
     }
 
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#partialUpdatePollInput")
+    fun testPartialUpdatePoll(call: RetrofitCall<PollResponse>, expected: KClass<*>) = runTest {
+        // given
+        val api = mock<PollsApi>()
+        whenever(api.partialUpdatePoll(any(), any())).doReturn(call)
+        val sut = Fixture()
+            .withPollsApi(api)
+            .get()
+        // when
+        val pollId = randomString()
+        val set = mapOf("name" to "New poll name")
+        val unset = listOf("custom_property")
+        val result = sut.partialUpdatePoll(pollId, set, unset).await()
+        // then
+        val expectedRequest = PartialUpdatePollRequest(set, unset)
+        result `should be instance of` expected
+        verify(api, times(1)).partialUpdatePoll(pollId, expectedRequest)
+    }
+
     @ParameterizedTest
     @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#closePollInput")
     fun testClosePoll(call: RetrofitCall<PollResponse>, expected: KClass<*>) = runTest {
         // given
         val api = mock<PollsApi>()
-        whenever(api.updatePoll(any(), any())).doReturn(call)
+        whenever(api.partialUpdatePoll(any(), any())).doReturn(call)
         val sut = Fixture()
             .withPollsApi(api)
             .get()
@@ -2153,28 +2181,72 @@ internal class MoshiChatApiTest {
         val pollId = randomString()
         val result = sut.closePoll(pollId).await()
         // then
-        val expectedRequest = PollUpdateRequest(set = mapOf("is_closed" to true))
+        val expectedRequest = PartialUpdatePollRequest(set = mapOf("is_closed" to true))
         result `should be instance of` expected
-        verify(api, times(1)).updatePoll(pollId, expectedRequest)
+        verify(api, times(1)).partialUpdatePoll(pollId, expectedRequest)
     }
 
     @ParameterizedTest
-    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#suggestPollOptionInput")
-    fun testSuggestPollOption(call: RetrofitCall<SuggestPollOptionResponse>, expected: KClass<*>) = runTest {
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#createPollOptionInput")
+    fun testCreatePollOption(call: RetrofitCall<PollOptionResponse>, expected: KClass<*>) = runTest {
         // given
         val api = mock<PollsApi>()
-        whenever(api.suggestPollOption(any(), any())).doReturn(call)
+        whenever(api.createPollOption(any(), any())).doReturn(call)
         val sut = Fixture()
             .withPollsApi(api)
             .get()
         // when
         val pollId = randomString()
         val option = randomString()
-        val result = sut.suggestPollOption(pollId, option).await()
+        val extraData = randomExtraData(1)
+        val request = CreatePollOptionRequest(option, extraData)
+        val result = sut.createPollOption(pollId, request).await()
         // then
-        val expectedOption = SuggestPollOptionRequest(option)
+        val expectedOption =
+            io.getstream.chat.android.client.api2.model.requests.CreatePollOptionRequest(option, extraData)
         result `should be instance of` expected
-        verify(api, times(1)).suggestPollOption(pollId, expectedOption)
+        verify(api, times(1)).createPollOption(pollId, expectedOption)
+    }
+
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#updatePollOptionInput")
+    fun testUpdatePollOption(call: RetrofitCall<PollOptionResponse>, expected: KClass<*>) = runTest {
+        // given
+        val api = mock<PollsApi>()
+        whenever(api.updatePollOption(any(), any())).doReturn(call)
+        val sut = Fixture()
+            .withPollsApi(api)
+            .get()
+        // when
+        val pollId = randomString()
+        val optionId = randomString()
+        val text = randomString()
+        val extraData = randomExtraData(1)
+        val request = UpdatePollOptionRequest(optionId, text, extraData)
+        val result = sut.updatePollOption(pollId, request).await()
+        // then
+        val expectedOption =
+            io.getstream.chat.android.client.api2.model.requests.UpdatePollOptionRequest(optionId, text, extraData)
+        result `should be instance of` expected
+        verify(api, times(1)).updatePollOption(pollId, expectedOption)
+    }
+
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#deletePollOptionInput")
+    fun testDeletePollOption(call: RetrofitCall<CompletableResponse>, expected: KClass<*>) = runTest {
+        // given
+        val api = mock<PollsApi>()
+        whenever(api.deletePollOption(any(), any())).doReturn(call)
+        val sut = Fixture()
+            .withPollsApi(api)
+            .get()
+        // when
+        val pollId = randomString()
+        val optionId = randomString()
+        val result = sut.deletePollOption(pollId, optionId).await()
+        // then
+        result `should be instance of` expected
+        verify(api, times(1)).deletePollOption(pollId, optionId)
     }
 
     @ParameterizedTest
@@ -2190,23 +2262,46 @@ internal class MoshiChatApiTest {
         val pollConfig = randomPollConfig()
         val result = sut.createPoll(pollConfig).await()
         // then
-        val expectedBody = PollRequest(
+        val expectedBody = CreatePollRequest(
             name = pollConfig.name,
             description = pollConfig.description,
-            options = pollConfig.options.map(::UpstreamOptionDto),
+            options = pollConfig.optionsWithExtraData.map {
+                UpstreamOptionDto(
+                    text = it.text,
+                    extraData = it.extraData,
+                )
+            },
             voting_visibility = when (pollConfig.votingVisibility) {
-                VotingVisibility.PUBLIC -> PollRequest.VOTING_VISIBILITY_PUBLIC
-                VotingVisibility.ANONYMOUS -> PollRequest.VOTING_VISIBILITY_ANONYMOUS
+                VotingVisibility.PUBLIC -> CreatePollRequest.VOTING_VISIBILITY_PUBLIC
+                VotingVisibility.ANONYMOUS -> CreatePollRequest.VOTING_VISIBILITY_ANONYMOUS
             },
             enforce_unique_vote = pollConfig.enforceUniqueVote,
             max_votes_allowed = pollConfig.maxVotesAllowed,
             allow_user_suggested_options = pollConfig.allowUserSuggestedOptions,
             allow_answers = pollConfig.allowAnswers,
+            extraData = pollConfig.extraData,
         )
         result `should be instance of` expected
         verify(api, times(1)).createPoll(expectedBody)
     }
 
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#getPollInput")
+    fun testGetPoll(call: RetrofitCall<PollResponse>, expected: KClass<*>) = runTest {
+        // given
+        val api = mock<PollsApi>()
+        whenever(api.getPoll(any())).doReturn(call)
+        val sut = Fixture()
+            .withPollsApi(api)
+            .get()
+        // when
+        val pollId = randomString()
+        val result = sut.getPoll(pollId).await()
+        // then
+        result `should be instance of` expected
+        verify(api, times(1)).getPoll(pollId)
+    }
+
     @ParameterizedTest
     @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#deletePollInput")
     fun testDeletePoll(call: RetrofitCall<CompletableResponse>, expected: KClass<*>) = runTest {
@@ -2224,6 +2319,59 @@ internal class MoshiChatApiTest {
         verify(api, times(1)).deletePoll(pollId)
     }
 
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#queryPollsInput")
+    fun testQueryPolls(call: RetrofitCall<QueryPollsResponse>, expected: KClass<*>) = runTest {
+        // given
+        val api = mock<PollsApi>()
+        whenever(api.queryPolls(any())).doReturn(call)
+        val sut = Fixture()
+            .withPollsApi(api)
+            .get()
+        // when
+        val filter = Filters.neutral()
+        val limit = positiveRandomInt()
+        val next = randomString()
+        val sort = QuerySortByField<Poll>()
+        val result = sut.queryPolls(filter, limit, next, sort).await()
+        // then
+        val expectedBody = QueryPollsRequest(
+            filter = filter.toMap(),
+            limit = limit,
+            next = next,
+            sort = sort.toDto(),
+        )
+        result `should be instance of` expected
+        verify(api, times(1)).queryPolls(expectedBody)
+    }
+
+    @ParameterizedTest
+    @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#queryPollVotesInput")
+    fun testQueryPollVotes(call: RetrofitCall<QueryPollVotesResponse>, expected: KClass<*>) = runTest {
+        // given
+        val api = mock<PollsApi>()
+        val pollId = randomString()
+        whenever(api.queryPollVotes(any(), any())).doReturn(call)
+        val sut = Fixture()
+            .withPollsApi(api)
+            .get()
+        // when
+        val filter = Filters.neutral()
+        val limit = positiveRandomInt()
+        val next = randomString()
+        val sort = QuerySortByField<Vote>()
+        val result = sut.queryPollVotes(pollId, filter, limit, next, sort).await()
+        // then
+        val expectedBody = QueryPollVotesRequest(
+            filter = filter.toMap(),
+            limit = limit,
+            next = next,
+            sort = sort.toDto(),
+        )
+        result `should be instance of` expected
+        verify(api, times(1)).queryPollVotes(pollId, expectedBody)
+    }
+
     @ParameterizedTest
     @MethodSource("io.getstream.chat.android.client.api2.MoshiChatApiTestArguments#createReminderInput")
     fun testCreateReminder(call: RetrofitCall<ReminderResponse>, expected: KClass<*>) = runTest {
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTestArguments.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTestArguments.kt
index dfe14aaab4e..8611401ef9f 100644
--- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTestArguments.kt
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTestArguments.kt
@@ -42,6 +42,7 @@ import io.getstream.chat.android.client.api2.model.response.FlagResponse
 import io.getstream.chat.android.client.api2.model.response.MessageResponse
 import io.getstream.chat.android.client.api2.model.response.MessagesResponse
 import io.getstream.chat.android.client.api2.model.response.MuteUserResponse
+import io.getstream.chat.android.client.api2.model.response.PollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.PollResponse
 import io.getstream.chat.android.client.api2.model.response.PollVoteResponse
 import io.getstream.chat.android.client.api2.model.response.QueryBannedUsersResponse
@@ -49,12 +50,13 @@ import io.getstream.chat.android.client.api2.model.response.QueryBlockedUsersRes
 import io.getstream.chat.android.client.api2.model.response.QueryChannelsResponse
 import io.getstream.chat.android.client.api2.model.response.QueryDraftMessagesResponse
 import io.getstream.chat.android.client.api2.model.response.QueryMembersResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollVotesResponse
+import io.getstream.chat.android.client.api2.model.response.QueryPollsResponse
 import io.getstream.chat.android.client.api2.model.response.QueryThreadsResponse
 import io.getstream.chat.android.client.api2.model.response.ReactionResponse
 import io.getstream.chat.android.client.api2.model.response.ReactionsResponse
 import io.getstream.chat.android.client.api2.model.response.ReminderResponse
 import io.getstream.chat.android.client.api2.model.response.SearchMessagesResponse
-import io.getstream.chat.android.client.api2.model.response.SuggestPollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.SyncHistoryResponse
 import io.getstream.chat.android.client.api2.model.response.ThreadResponse
 import io.getstream.chat.android.client.api2.model.response.TokenResponse
@@ -81,7 +83,7 @@ import io.getstream.result.Result
 import okhttp3.ResponseBody
 import org.junit.jupiter.params.provider.Arguments
 
-@Suppress("UNUSED")
+@Suppress("UNUSED", "LargeClass")
 internal object MoshiChatApiTestArguments {
 
     @JvmStatic
@@ -500,29 +502,54 @@ internal object MoshiChatApiTestArguments {
     @JvmStatic
     fun removePollVoteInput() = pollVoteResponseArguments()
 
+    @JvmStatic
+    fun partialUpdatePollInput() = pollResponseArguments()
+
     @JvmStatic
     fun closePollInput() = pollResponseArguments()
 
     @JvmStatic
     fun createPollInput() = pollResponseArguments()
 
+    @JvmStatic
+    fun getPollInput() = pollResponseArguments()
+
     @JvmStatic
     fun deletePollInput() = completableResponseArguments()
 
     @JvmStatic
-    fun suggestPollOptionInput() = listOf(
+    fun queryPollsInput() = listOf(
         Arguments.of(
-            RetroSuccess(
-                SuggestPollOptionResponse(
-                    duration = randomString(),
-                    poll_option = Mother.randomDownstreamOptionDto(),
-                ),
-            ).toRetrofitCall(),
+            RetroSuccess(Mother.randomQueryPollsResponse()).toRetrofitCall(),
             Result.Success::class,
         ),
-        Arguments.of(RetroError<SuggestPollOptionResponse>(statusCode = 500).toRetrofitCall(), Result.Failure::class),
+        Arguments.of(
+            RetroError<QueryPollsResponse>(statusCode = 500).toRetrofitCall(),
+            Result.Failure::class,
+        ),
     )
 
+    @JvmStatic
+    fun queryPollVotesInput() = listOf(
+        Arguments.of(
+            RetroSuccess(Mother.randomQueryPollVotesResponse()).toRetrofitCall(),
+            Result.Success::class,
+        ),
+        Arguments.of(
+            RetroError<QueryPollVotesResponse>(statusCode = 500).toRetrofitCall(),
+            Result.Failure::class,
+        ),
+    )
+
+    @JvmStatic
+    fun createPollOptionInput() = pollOptionResponseArguments()
+
+    @JvmStatic
+    fun updatePollOptionInput() = pollOptionResponseArguments()
+
+    @JvmStatic
+    fun deletePollOptionInput() = completableResponseArguments()
+
     @JvmStatic
     fun createReminderInput() = reminderResponseArguments()
 
@@ -758,6 +785,19 @@ internal object MoshiChatApiTestArguments {
         Arguments.of(RetroError<PollResponse>(statusCode = 500).toRetrofitCall(), Result.Failure::class),
     )
 
+    private fun pollOptionResponseArguments() = listOf(
+        Arguments.of(
+            RetroSuccess(
+                PollOptionResponse(
+                    duration = randomString(),
+                    poll_option = Mother.randomDownstreamOptionDto(),
+                ),
+            ).toRetrofitCall(),
+            Result.Success::class,
+        ),
+        Arguments.of(RetroError<PollOptionResponse>(statusCode = 500).toRetrofitCall(), Result.Failure::class),
+    )
+
     private fun pollVoteResponseArguments() = listOf(
         Arguments.of(
             RetroSuccess(
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt
index fa7ef216cf7..88f8d096ef9 100644
--- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt
@@ -51,6 +51,8 @@ import io.getstream.chat.android.client.Mother.randomDownstreamUserBlockDto
 import io.getstream.chat.android.client.Mother.randomDownstreamUserDto
 import io.getstream.chat.android.client.Mother.randomDownstreamVoteDto
 import io.getstream.chat.android.client.Mother.randomPrivacySettingsDto
+import io.getstream.chat.android.client.Mother.randomQueryPollVotesResponse
+import io.getstream.chat.android.client.Mother.randomQueryPollsResponse
 import io.getstream.chat.android.client.Mother.randomQueryRemindersResponse
 import io.getstream.chat.android.client.Mother.randomSearchWarningDto
 import io.getstream.chat.android.client.Mother.randomUnreadChannelByTypeDto
@@ -90,6 +92,8 @@ import io.getstream.chat.android.models.Option
 import io.getstream.chat.android.models.PendingMessage
 import io.getstream.chat.android.models.Poll
 import io.getstream.chat.android.models.PushProvider
+import io.getstream.chat.android.models.QueryPollVotesResult
+import io.getstream.chat.android.models.QueryPollsResult
 import io.getstream.chat.android.models.QueryRemindersResult
 import io.getstream.chat.android.models.Reaction
 import io.getstream.chat.android.models.ReactionGroup
@@ -406,13 +410,14 @@ internal class DomainMappingTest {
             name = pollDto.name,
             description = pollDto.description,
             options = options.map {
-                Option(it.id, it.text)
+                Option(it.id, it.text, it.extraData ?: emptyMap())
             },
             votingVisibility = VotingVisibility.PUBLIC,
             enforceUniqueVote = pollDto.enforce_unique_vote,
             maxVotesAllowed = pollDto.max_votes_allowed ?: 1,
             allowUserSuggestedOptions = pollDto.allow_user_suggested_options,
             allowAnswers = pollDto.allow_answers,
+            voteCount = pollDto.vote_count,
             voteCountsByOption = pollDto.vote_counts_by_option ?: emptyMap(),
             votes = listOf(
                 Vote(
@@ -444,7 +449,8 @@ internal class DomainMappingTest {
             ),
             createdAt = pollDto.created_at,
             updatedAt = pollDto.updated_at,
-            closed = pollDto.is_closed,
+            closed = pollDto.is_closed ?: false,
+            answersCount = pollDto.answers_count,
             answers = listOf(
                 Answer(
                     id = answer.id,
@@ -455,8 +461,10 @@ internal class DomainMappingTest {
                     user = with(sut) { answer.user?.toDomain() },
                 ),
             ),
+            createdBy = with(sut) { pollDto.created_by?.toDomain() },
+            extraData = pollDto.extraData ?: emptyMap(),
         )
-        poll shouldBeEqualTo expected
+        Assertions.assertEquals(expected, poll)
     }
 
     @Test
@@ -847,6 +855,30 @@ internal class DomainMappingTest {
         result shouldBeEqualTo expected
     }
 
+    @Test
+    fun `QueryPollVotesResponse is correctly mapped to QueryPollVotesResult`() {
+        val input = randomQueryPollVotesResponse()
+        val sut = Fixture().get()
+        val result = with(sut) { input.toDomain() }
+        val expected = QueryPollVotesResult(
+            votes = input.votes.map { with(sut) { it.toDomain() } },
+            next = input.next,
+        )
+        result shouldBeEqualTo expected
+    }
+
+    @Test
+    fun `QueryPollsResponse is correctly mapped to QueryPollsResult`() {
+        val input = randomQueryPollsResponse()
+        val sut = Fixture().get()
+        val result = with(sut) { input.toDomain() }
+        val expected = QueryPollsResult(
+            polls = input.polls.map { with(sut) { it.toDomain() } },
+            next = input.next,
+        )
+        result shouldBeEqualTo expected
+    }
+
     @Test
     fun `UnreadDto is correctly mapped to UnreadCounts`() {
         val input = randomUnreadDto(
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/PollExtensionsTests.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/PollExtensionsTests.kt
index 8a9c2ac68e4..7d43b718c65 100644
--- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/PollExtensionsTests.kt
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/PollExtensionsTests.kt
@@ -80,13 +80,16 @@ internal class PollExtensionsTests {
         maxVotesAllowed = 1,
         allowUserSuggestedOptions = false,
         allowAnswers = true,
+        voteCount = 2,
         voteCountsByOption = mapOf("option1" to 1, "option2" to 1),
         votes = listOf(vote1, vote2),
         ownVotes = listOf(vote1),
         createdAt = now,
         updatedAt = now,
         closed = false,
+        answersCount = 1,
         answers = listOf(answer1),
+        createdBy = user1,
     )
 
     @Test
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/ThreadExtensionsTests.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/ThreadExtensionsTests.kt
index 9ee955a5961..e3cb85643f3 100644
--- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/ThreadExtensionsTests.kt
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/extensions/internal/ThreadExtensionsTests.kt
@@ -178,11 +178,15 @@ internal class ThreadExtensionsTests {
             allowUserSuggestedOptions = false,
             allowAnswers = false,
             voteCountsByOption = emptyMap(),
+            voteCount = 0,
             votes = emptyList(),
             ownVotes = emptyList(),
             createdAt = now,
             updatedAt = now,
             closed = false,
+            answersCount = 0,
+            answers = emptyList(),
+            createdBy = null,
         )
         val threadWithPoll = baseThread.copy(
             parentMessage = parentMessage.copy(poll = originalPoll),
@@ -216,11 +220,15 @@ internal class ThreadExtensionsTests {
             allowUserSuggestedOptions = false,
             allowAnswers = false,
             voteCountsByOption = emptyMap(),
+            voteCount = 0,
             votes = emptyList(),
             ownVotes = emptyList(),
             createdAt = now,
             updatedAt = now,
             closed = false,
+            answersCount = 0,
+            answers = emptyList(),
+            createdBy = null,
         )
         val newPoll = Poll(
             id = "poll2",
@@ -236,11 +244,15 @@ internal class ThreadExtensionsTests {
             allowUserSuggestedOptions = true,
             allowAnswers = true,
             voteCountsByOption = mapOf("option1" to 5),
+            voteCount = 0,
             votes = emptyList(),
             ownVotes = emptyList(),
             createdAt = now,
             updatedAt = now,
             closed = true,
+            answersCount = 0,
+            answers = emptyList(),
+            createdBy = null,
         )
         val threadWithPoll = baseThread.copy(
             parentMessage = parentMessage.copy(poll = originalPoll),
@@ -275,11 +287,15 @@ internal class ThreadExtensionsTests {
             allowUserSuggestedOptions = false,
             allowAnswers = false,
             voteCountsByOption = emptyMap(),
+            voteCount = 0,
             votes = emptyList(),
             ownVotes = emptyList(),
             createdAt = now,
             updatedAt = now,
             closed = false,
+            answersCount = 0,
+            answers = emptyList(),
+            createdBy = null,
         )
         val updatedParent = parentMessage.copy(
             text = "Updated parent message",
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/CreatePollRequestAdapterTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/CreatePollRequestAdapterTest.kt
new file mode 100644
index 00000000000..9ce311d3971
--- /dev/null
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/CreatePollRequestAdapterTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.parser2
+
+import io.getstream.chat.android.client.parser2.testdata.PollDtoTestData
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+internal class CreatePollRequestAdapterTest {
+    private val parser = ParserFactory.createMoshiChatParser()
+
+    @Test
+    fun `Serialize CreatePollRequest with custom fields`() {
+        val json = parser.toJson(PollDtoTestData.createPollRequest)
+        Assertions.assertEquals(PollDtoTestData.createPollRequestJson, json)
+    }
+
+    @Test
+    fun `Serialize CreatePollRequest without custom fields`() {
+        val json = parser.toJson(PollDtoTestData.createPollRequestWithoutExtraData)
+        Assertions.assertEquals(PollDtoTestData.createPollRequestJsonWithoutExtraData, json)
+    }
+}
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/DownstreamPollDtoAdapterTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/DownstreamPollDtoAdapterTest.kt
new file mode 100644
index 00000000000..270ac364b75
--- /dev/null
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/DownstreamPollDtoAdapterTest.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.parser2
+
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollDto
+import io.getstream.chat.android.client.parser2.testdata.PollDtoTestData
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+internal class DownstreamPollDtoAdapterTest {
+    private val parser = ParserFactory.createMoshiChatParser()
+
+    @Test
+    fun `Deserialize JSON poll with custom fields`() {
+        val poll = parser.fromJson(
+            PollDtoTestData.downstreamPollJson,
+            DownstreamPollDto::class.java,
+        )
+        Assertions.assertEquals(PollDtoTestData.downstreamPoll, poll)
+    }
+
+    @Test
+    fun `Deserialize JSON poll without custom fields`() {
+        val poll = parser.fromJson(
+            PollDtoTestData.downstreamPollJsonWithoutExtraData,
+            DownstreamPollDto::class.java,
+        )
+        Assertions.assertEquals(PollDtoTestData.downstreamPollWithoutExtraData, poll)
+    }
+}
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/DownstreamPollOptionDtoAdapterTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/DownstreamPollOptionDtoAdapterTest.kt
new file mode 100644
index 00000000000..b563141479f
--- /dev/null
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/DownstreamPollOptionDtoAdapterTest.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.parser2
+
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollOptionDto
+import io.getstream.chat.android.client.parser2.testdata.PollDtoTestData
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+internal class DownstreamPollOptionDtoAdapterTest {
+    private val parser = ParserFactory.createMoshiChatParser()
+
+    @Test
+    fun `Deserialize JSON poll option with custom fields`() {
+        val option = parser.fromJson(
+            PollDtoTestData.downstreamPollOptionJson,
+            DownstreamPollOptionDto::class.java,
+        )
+        Assertions.assertEquals(PollDtoTestData.downstreamPollOption, option)
+    }
+
+    @Test
+    fun `Deserialize JSON poll option without custom fields`() {
+        val option = parser.fromJson(
+            PollDtoTestData.downstreamPollOptionJsonWithoutExtraData,
+            DownstreamPollOptionDto::class.java,
+        )
+        Assertions.assertEquals(PollDtoTestData.downstreamPollOptionWithoutExtraData, option)
+    }
+}
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/UpstreamOptionDtoAdapterTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/UpstreamOptionDtoAdapterTest.kt
new file mode 100644
index 00000000000..6465646960e
--- /dev/null
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/UpstreamOptionDtoAdapterTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.parser2
+
+import io.getstream.chat.android.client.parser2.testdata.PollDtoTestData
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+internal class UpstreamOptionDtoAdapterTest {
+    private val parser = ParserFactory.createMoshiChatParser()
+
+    @Test
+    fun `Serialize UpstreamOptionDto with custom fields`() {
+        val json = parser.toJson(PollDtoTestData.upstreamOption)
+        Assertions.assertEquals(PollDtoTestData.upstreamOptionJson, json)
+    }
+
+    @Test
+    fun `Serialize UpstreamOptionDto without custom fields`() {
+        val json = parser.toJson(PollDtoTestData.upstreamOptionWithoutExtraData)
+        Assertions.assertEquals(PollDtoTestData.upstreamOptionJsonWithoutExtraData, json)
+    }
+}
diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/PollDtoTestData.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/PollDtoTestData.kt
new file mode 100644
index 00000000000..ddebf77c904
--- /dev/null
+++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/testdata/PollDtoTestData.kt
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.client.parser2.testdata
+
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollDto
+import io.getstream.chat.android.client.api2.model.dto.DownstreamPollOptionDto
+import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
+import io.getstream.chat.android.client.api2.model.requests.UpstreamOptionDto
+import org.intellij.lang.annotations.Language
+import java.util.Date
+
+internal object PollDtoTestData {
+
+    // DownstreamPollOptionDto Test Data
+
+    @Language("JSON")
+    val downstreamPollOptionJson =
+        """{
+          "id": "option1",
+          "text": "Option 1",
+          "extraData": {
+            "key1": "value1",
+            "key2": true
+          },
+          "customKey": "customValue"
+        }"""
+
+    val downstreamPollOption = DownstreamPollOptionDto(
+        id = "option1",
+        text = "Option 1",
+        extraData = mapOf(
+            "extraData" to mapOf(
+                "key1" to "value1",
+                "key2" to true,
+            ),
+            "customKey" to "customValue",
+        ),
+    )
+
+    @Language("JSON")
+    val downstreamPollOptionJsonWithoutExtraData =
+        """{
+          "id": "option2",
+          "text": "Option 2"
+        }"""
+
+    val downstreamPollOptionWithoutExtraData = DownstreamPollOptionDto(
+        id = "option2",
+        text = "Option 2",
+        extraData = emptyMap(),
+    )
+
+    // DownstreamPollDto Test Data
+
+    @Language("JSON")
+    val downstreamPollJson =
+        """{
+          "allow_answers": true,
+          "allow_user_suggested_options": false,
+          "answers_count": 5,
+          "created_at": "2020-06-10T11:04:31.000Z",
+          "created_by": ${UserDtoTestData.downstreamJson},
+          "created_by_id": "userId",
+          "description": "Poll description",
+          "enforce_unique_vote": true,
+          "id": "poll1",
+          "is_closed": false,
+          "latest_answers": [],
+          "latest_votes_by_option": {},
+          "max_votes_allowed": 1,
+          "name": "Poll Name",
+          "options": [
+            {
+              "id": "option1",
+              "text": "Option 1"
+            }
+          ],
+          "own_votes": [],
+          "updated_at": "2020-06-10T11:04:31.588Z",
+          "vote_count": 10,
+          "vote_counts_by_option": {
+            "option1": 10
+          },
+          "voting_visibility": "public",
+          "extraData": {
+            "poll_key": "poll_value"
+          },
+          "customPollKey": "customPollValue"
+        }"""
+
+    val downstreamPoll = DownstreamPollDto(
+        allow_answers = true,
+        allow_user_suggested_options = false,
+        answers_count = 5,
+        created_at = Date(1591787071000),
+        created_by = UserDtoTestData.downstreamUser,
+        created_by_id = "userId",
+        description = "Poll description",
+        enforce_unique_vote = true,
+        id = "poll1",
+        is_closed = false,
+        latest_answers = emptyList(),
+        latest_votes_by_option = emptyMap(),
+        max_votes_allowed = 1,
+        name = "Poll Name",
+        options = listOf(
+            DownstreamPollOptionDto(
+                id = "option1",
+                text = "Option 1",
+                extraData = emptyMap(),
+            ),
+        ),
+        own_votes = emptyList(),
+        updated_at = Date(1591787071588),
+        vote_count = 10,
+        vote_counts_by_option = mapOf("option1" to 10),
+        voting_visibility = "public",
+        extraData = mapOf(
+            "extraData" to mapOf(
+                "poll_key" to "poll_value",
+            ),
+            "customPollKey" to "customPollValue",
+        ),
+    )
+
+    @Language("JSON")
+    val downstreamPollJsonWithoutExtraData =
+        """{
+          "allow_answers": false,
+          "allow_user_suggested_options": true,
+          "answers_count": 0,
+          "created_at": "2020-06-10T11:04:31.000Z",
+          "created_by": ${UserDtoTestData.downstreamJson},
+          "created_by_id": "userId",
+          "description": "Simple poll",
+          "enforce_unique_vote": false,
+          "id": "poll2",
+          "is_closed": null,
+          "latest_answers": null,
+          "latest_votes_by_option": null,
+          "max_votes_allowed": null,
+          "name": "Simple Poll",
+          "options": [],
+          "own_votes": [],
+          "updated_at": "2020-06-10T11:04:31.588Z",
+          "vote_count": 0,
+          "vote_counts_by_option": null,
+          "voting_visibility": null
+        }"""
+
+    val downstreamPollWithoutExtraData = DownstreamPollDto(
+        allow_answers = false,
+        allow_user_suggested_options = true,
+        answers_count = 0,
+        created_at = Date(1591787071000),
+        created_by = UserDtoTestData.downstreamUser,
+        created_by_id = "userId",
+        description = "Simple poll",
+        enforce_unique_vote = false,
+        id = "poll2",
+        is_closed = null,
+        latest_answers = null,
+        latest_votes_by_option = null,
+        max_votes_allowed = null,
+        name = "Simple Poll",
+        options = emptyList(),
+        own_votes = emptyList(),
+        updated_at = Date(1591787071588),
+        vote_count = 0,
+        vote_counts_by_option = null,
+        voting_visibility = null,
+        extraData = emptyMap(),
+    )
+
+    // UpstreamOptionDto Test Data
+
+    @Language("JSON")
+    val upstreamOptionJson =
+        """{
+          "text": "option",
+          "customKey1": "customValue1",
+          "customKey2": 42.0
+        }""".withoutWhitespace()
+
+    val upstreamOption = UpstreamOptionDto(
+        text = "option",
+        extraData = mapOf(
+            "customKey1" to "customValue1",
+            "customKey2" to 42.0, // JSON numbers are parsed as Double
+        ),
+    )
+
+    @Language("JSON")
+    val upstreamOptionJsonWithoutExtraData =
+        """{
+          "text": "option"
+        }""".withoutWhitespace()
+
+    val upstreamOptionWithoutExtraData = UpstreamOptionDto(
+        text = "option",
+        extraData = emptyMap(),
+    )
+
+    // CreatePollRequest Test Data
+
+    @Language("JSON")
+    val createPollRequestJson =
+        """{
+          "allow_answers": true,
+          "allow_user_suggested_options": false,
+          "description": "description",
+          "enforce_unique_vote": true,
+          "max_votes_allowed": 1,
+          "name": "poll",
+          "options": [
+            {
+              "text": "option"
+            }
+          ],
+          "voting_visibility": "public",
+          "customRequestKey": "customRequestValue"
+        }""".withoutWhitespace()
+
+    val createPollRequest = CreatePollRequest(
+        allow_answers = true,
+        allow_user_suggested_options = false,
+        description = "description",
+        enforce_unique_vote = true,
+        max_votes_allowed = 1,
+        name = "poll",
+        options = listOf(
+            UpstreamOptionDto(
+                text = "option",
+                extraData = emptyMap(),
+            ),
+        ),
+        voting_visibility = "public",
+        extraData = mapOf(
+            "customRequestKey" to "customRequestValue",
+        ),
+    )
+
+    @Language("JSON")
+    val createPollRequestJsonWithoutExtraData =
+        """{
+          "allow_answers": false,
+          "allow_user_suggested_options": false,
+          "description": "",
+          "enforce_unique_vote": false,
+          "max_votes_allowed": 1,
+          "name": "poll",
+          "options": [],
+          "voting_visibility": "public"
+        }""".withoutWhitespace()
+
+    val createPollRequestWithoutExtraData = CreatePollRequest(
+        allow_answers = false,
+        allow_user_suggested_options = false,
+        description = "",
+        enforce_unique_vote = false,
+        max_votes_allowed = 1,
+        name = "poll",
+        options = emptyList(),
+        voting_visibility = "public",
+        extraData = emptyMap(),
+    )
+}
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtils.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtils.kt
index 2fd1c195db9..0a2092cfd3a 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtils.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtils.kt
@@ -18,6 +18,7 @@ package io.getstream.chat.android.compose.ui.messages.attachments.poll
 
 import io.getstream.chat.android.compose.ui.messages.attachments.factory.AttachmentPickerPollCreation
 import io.getstream.chat.android.models.PollConfig
+import io.getstream.chat.android.models.PollOption
 import io.getstream.chat.android.models.VotingVisibility
 
 /**
@@ -62,7 +63,7 @@ internal fun pollConfigFrom(
     }
     return PollConfig(
         name = pollQuestion,
-        options = options,
+        options = options.map(::PollOption),
         allowUserSuggestedOptions = allowUserSuggestedOptions,
         allowAnswers = allowAnswers,
         votingVisibility = votingVisibility,
diff --git a/stream-chat-android-compose/src/test/kotlin/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtilsTest.kt b/stream-chat-android-compose/src/test/kotlin/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtilsTest.kt
index c284b0f6377..5d05aeff5d1 100644
--- a/stream-chat-android-compose/src/test/kotlin/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtilsTest.kt
+++ b/stream-chat-android-compose/src/test/kotlin/io/getstream/chat/android/compose/ui/messages/attachments/poll/AttachmentsPickerPollUtilsTest.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import androidx.compose.ui.text.input.KeyboardType
 import io.getstream.chat.android.compose.ui.util.DefaultPollSwitchItemFactory
 import io.getstream.chat.android.models.PollConfig
+import io.getstream.chat.android.models.PollOption
 import io.getstream.chat.android.models.VotingVisibility
 import org.amshove.kluent.`should be equal to`
 import org.junit.Test
@@ -46,7 +47,7 @@ internal class AttachmentsPickerPollUtilsTest {
         // then
         val expected = PollConfig(
             name = "Poll question",
-            options = listOf("Answer 1", "Answer 2"),
+            options = listOf(PollOption("Answer 1"), PollOption("Answer 2")),
             description = "",
             votingVisibility = VotingVisibility.PUBLIC,
             enforceUniqueVote = true,
@@ -103,7 +104,7 @@ internal class AttachmentsPickerPollUtilsTest {
         // then
         val expected = PollConfig(
             name = "Poll question",
-            options = listOf("Answer 1", "Answer 2"),
+            options = listOf(PollOption("Answer 1"), PollOption("Answer 2")),
             description = "",
             votingVisibility = VotingVisibility.ANONYMOUS,
             enforceUniqueVote = false,
diff --git a/stream-chat-android-core/api/stream-chat-android-core.api b/stream-chat-android-core/api/stream-chat-android-core.api
index 0a309e3930c..519e291e109 100644
--- a/stream-chat-android-core/api/stream-chat-android-core.api
+++ b/stream-chat-android-core/api/stream-chat-android-core.api
@@ -1643,12 +1643,15 @@ public final class io/getstream/chat/android/models/NotInFilterObject : io/getst
 }
 
 public final class io/getstream/chat/android/models/Option {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lio/getstream/chat/android/models/Option;
-	public static synthetic fun copy$default (Lio/getstream/chat/android/models/Option;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/getstream/chat/android/models/Option;
+	public final fun component3 ()Ljava/util/Map;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lio/getstream/chat/android/models/Option;
+	public static synthetic fun copy$default (Lio/getstream/chat/android/models/Option;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lio/getstream/chat/android/models/Option;
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getExtraData ()Ljava/util/Map;
 	public final fun getId ()Ljava/lang/String;
 	public final fun getText ()Ljava/lang/String;
 	public fun hashCode ()I
@@ -1685,18 +1688,22 @@ public final class io/getstream/chat/android/models/PendingMessage$Builder {
 	public final fun withMetadata (Ljava/util/Map;)Lio/getstream/chat/android/models/PendingMessage$Builder;
 }
 
-public final class io/getstream/chat/android/models/Poll {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZLjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZLjava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZLjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZLjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public final class io/getstream/chat/android/models/Poll : io/getstream/chat/android/models/querysort/ComparableFieldProvider {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZILjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZILjava/util/List;Lio/getstream/chat/android/models/User;Ljava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZILjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZILjava/util/List;Lio/getstream/chat/android/models/User;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/util/Map;
-	public final fun component11 ()Ljava/util/List;
+	public final fun component10 ()I
+	public final fun component11 ()Ljava/util/Map;
 	public final fun component12 ()Ljava/util/List;
-	public final fun component13 ()Ljava/util/Date;
+	public final fun component13 ()Ljava/util/List;
 	public final fun component14 ()Ljava/util/Date;
-	public final fun component15 ()Z
-	public final fun component16 ()Ljava/util/List;
+	public final fun component15 ()Ljava/util/Date;
+	public final fun component16 ()Z
+	public final fun component17 ()I
+	public final fun component18 ()Ljava/util/List;
+	public final fun component19 ()Lio/getstream/chat/android/models/User;
 	public final fun component2 ()Ljava/lang/String;
+	public final fun component20 ()Ljava/util/Map;
 	public final fun component3 ()Ljava/lang/String;
 	public final fun component4 ()Ljava/util/List;
 	public final fun component5 ()Lio/getstream/chat/android/models/VotingVisibility;
@@ -1704,22 +1711,27 @@ public final class io/getstream/chat/android/models/Poll {
 	public final fun component7 ()I
 	public final fun component8 ()Z
 	public final fun component9 ()Z
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZLjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZLjava/util/List;)Lio/getstream/chat/android/models/Poll;
-	public static synthetic fun copy$default (Lio/getstream/chat/android/models/Poll;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZLjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZLjava/util/List;ILjava/lang/Object;)Lio/getstream/chat/android/models/Poll;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZILjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZILjava/util/List;Lio/getstream/chat/android/models/User;Ljava/util/Map;)Lio/getstream/chat/android/models/Poll;
+	public static synthetic fun copy$default (Lio/getstream/chat/android/models/Poll;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lio/getstream/chat/android/models/VotingVisibility;ZIZZILjava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Date;Ljava/util/Date;ZILjava/util/List;Lio/getstream/chat/android/models/User;Ljava/util/Map;ILjava/lang/Object;)Lio/getstream/chat/android/models/Poll;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAllowAnswers ()Z
 	public final fun getAllowUserSuggestedOptions ()Z
 	public final fun getAnswers ()Ljava/util/List;
+	public final fun getAnswersCount ()I
 	public final fun getClosed ()Z
+	public fun getComparableField (Ljava/lang/String;)Ljava/lang/Comparable;
 	public final fun getCreatedAt ()Ljava/util/Date;
+	public final fun getCreatedBy ()Lio/getstream/chat/android/models/User;
 	public final fun getDescription ()Ljava/lang/String;
 	public final fun getEnforceUniqueVote ()Z
+	public final fun getExtraData ()Ljava/util/Map;
 	public final fun getId ()Ljava/lang/String;
 	public final fun getMaxVotesAllowed ()I
 	public final fun getName ()Ljava/lang/String;
 	public final fun getOptions ()Ljava/util/List;
 	public final fun getOwnVotes ()Ljava/util/List;
 	public final fun getUpdatedAt ()Ljava/util/Date;
+	public final fun getVoteCount ()I
 	public final fun getVoteCountsByOption ()Ljava/util/Map;
 	public final fun getVotes ()Ljava/util/List;
 	public final fun getVotes (Lio/getstream/chat/android/models/Option;)Ljava/util/List;
@@ -1731,21 +1743,23 @@ public final class io/getstream/chat/android/models/Poll {
 public final class io/getstream/chat/android/models/PollConfig {
 	public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lio/getstream/chat/android/models/VotingVisibility;ZIZZ)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lio/getstream/chat/android/models/VotingVisibility;ZIZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lio/getstream/chat/android/models/VotingVisibility;ZIZZLjava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lio/getstream/chat/android/models/VotingVisibility;ZIZZLjava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/util/List;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Lio/getstream/chat/android/models/VotingVisibility;
-	public final fun component5 ()Z
-	public final fun component6 ()I
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Lio/getstream/chat/android/models/VotingVisibility;
+	public final fun component4 ()Z
+	public final fun component5 ()I
+	public final fun component6 ()Z
 	public final fun component7 ()Z
-	public final fun component8 ()Z
-	public final fun copy (Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lio/getstream/chat/android/models/VotingVisibility;ZIZZ)Lio/getstream/chat/android/models/PollConfig;
-	public static synthetic fun copy$default (Lio/getstream/chat/android/models/PollConfig;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Lio/getstream/chat/android/models/VotingVisibility;ZIZZILjava/lang/Object;)Lio/getstream/chat/android/models/PollConfig;
+	public final fun component8 ()Ljava/util/Map;
+	public final fun component9 ()Ljava/util/List;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAllowAnswers ()Z
 	public final fun getAllowUserSuggestedOptions ()Z
 	public final fun getDescription ()Ljava/lang/String;
 	public final fun getEnforceUniqueVote ()Z
+	public final fun getExtraData ()Ljava/util/Map;
 	public final fun getMaxVotesAllowed ()I
 	public final fun getName ()Ljava/lang/String;
 	public final fun getOptions ()Ljava/util/List;
@@ -1754,6 +1768,20 @@ public final class io/getstream/chat/android/models/PollConfig {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class io/getstream/chat/android/models/PollOption {
+	public fun <init> (Ljava/lang/String;Ljava/util/Map;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/util/Map;
+	public final fun copy (Ljava/lang/String;Ljava/util/Map;)Lio/getstream/chat/android/models/PollOption;
+	public static synthetic fun copy$default (Lio/getstream/chat/android/models/PollOption;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lio/getstream/chat/android/models/PollOption;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getExtraData ()Ljava/util/Map;
+	public final fun getText ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class io/getstream/chat/android/models/PushMessage {
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
 	public final fun component1 ()Ljava/lang/String;
@@ -1837,6 +1865,32 @@ public final class io/getstream/chat/android/models/QueryDraftsResult {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class io/getstream/chat/android/models/QueryPollVotesResult {
+	public fun <init> (Ljava/util/List;Ljava/lang/String;)V
+	public final fun component1 ()Ljava/util/List;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun copy (Ljava/util/List;Ljava/lang/String;)Lio/getstream/chat/android/models/QueryPollVotesResult;
+	public static synthetic fun copy$default (Lio/getstream/chat/android/models/QueryPollVotesResult;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lio/getstream/chat/android/models/QueryPollVotesResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getNext ()Ljava/lang/String;
+	public final fun getVotes ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class io/getstream/chat/android/models/QueryPollsResult {
+	public fun <init> (Ljava/util/List;Ljava/lang/String;)V
+	public final fun component1 ()Ljava/util/List;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun copy (Ljava/util/List;Ljava/lang/String;)Lio/getstream/chat/android/models/QueryPollsResult;
+	public static synthetic fun copy$default (Lio/getstream/chat/android/models/QueryPollsResult;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lio/getstream/chat/android/models/QueryPollsResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getNext ()Ljava/lang/String;
+	public final fun getPolls ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class io/getstream/chat/android/models/QueryRemindersResult {
 	public fun <init> (Ljava/util/List;Ljava/lang/String;)V
 	public final fun component1 ()Ljava/util/List;
@@ -2448,7 +2502,7 @@ public final class io/getstream/chat/android/models/VideoCallToken {
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class io/getstream/chat/android/models/Vote {
+public final class io/getstream/chat/android/models/Vote : io/getstream/chat/android/models/querysort/ComparableFieldProvider {
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Lio/getstream/chat/android/models/User;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Ljava/lang/String;
@@ -2459,6 +2513,7 @@ public final class io/getstream/chat/android/models/Vote {
 	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Lio/getstream/chat/android/models/User;)Lio/getstream/chat/android/models/Vote;
 	public static synthetic fun copy$default (Lio/getstream/chat/android/models/Vote;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Lio/getstream/chat/android/models/User;ILjava/lang/Object;)Lio/getstream/chat/android/models/Vote;
 	public fun equals (Ljava/lang/Object;)Z
+	public fun getComparableField (Ljava/lang/String;)Ljava/lang/Comparable;
 	public final fun getCreatedAt ()Ljava/util/Date;
 	public final fun getId ()Ljava/lang/String;
 	public final fun getOptionId ()Ljava/lang/String;
diff --git a/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/Poll.kt b/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/Poll.kt
index 6e120593574..ddef5372c16 100644
--- a/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/Poll.kt
+++ b/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/Poll.kt
@@ -17,6 +17,8 @@
 package io.getstream.chat.android.models
 
 import androidx.compose.runtime.Immutable
+import io.getstream.chat.android.core.internal.InternalStreamChatApi
+import io.getstream.chat.android.models.querysort.ComparableFieldProvider
 import java.util.Date
 
 /**
@@ -32,13 +34,17 @@ import java.util.Date
  * @property maxVotesAllowed The maximum number of votes a user can cast.
  * @property allowUserSuggestedOptions If set to true, users can suggest new options.
  * @property allowAnswers If set to true, users can vote.
+ * @property voteCount The total number of votes cast in the poll.
  * @property voteCountsByOption The number of votes for each option.
  * @property votes The list of votes.
  * @property ownVotes The list of votes cast by the current user.
  * @property createdAt The creation date of the poll.
  * @property updatedAt The last update date of the poll.
  * @property closed If set to true, the poll is closed and no more votes can be cast.
+ * @property answersCount The total number of answers in the poll.
  * @property answers The list of poll answers.
+ * @property createdBy The user who created the poll. This property is optional and might be null.
+ * @property extraData Any additional data associated with the poll.
  */
 @Immutable
 public data class Poll(
@@ -51,14 +57,18 @@ public data class Poll(
     val maxVotesAllowed: Int,
     val allowUserSuggestedOptions: Boolean,
     val allowAnswers: Boolean,
+    val voteCount: Int,
     val voteCountsByOption: Map<String, Int>,
     val votes: List<Vote>,
     val ownVotes: List<Vote>,
     val createdAt: Date,
     val updatedAt: Date,
     val closed: Boolean,
+    val answersCount: Int,
     val answers: List<Answer> = emptyList(),
-) {
+    val createdBy: User?,
+    val extraData: Map<String, Any> = emptyMap(),
+) : ComparableFieldProvider {
 
     /**
      * Get the votes for a specific option.
@@ -67,6 +77,15 @@ public data class Poll(
      * @return The list of votes for the option.
      */
     public fun getVotes(option: Option): List<Vote> = votes.filter { it.optionId == option.id }
+
+    override fun getComparableField(fieldName: String): Comparable<*>? = when (fieldName) {
+        "id" -> id
+        "name" -> name
+        "created_at", "createdAt" -> createdAt
+        "updated_at", "updatedAt" -> updatedAt
+        "is_closed", "isClosed" -> closed
+        else -> null
+    }
 }
 
 /**
@@ -94,35 +113,130 @@ public data class Answer(
  *
  * @property id The unique identifier of the option.
  * @property text The text of the option.
+ * @property extraData Any additional data associated with the option.
  */
 @Immutable
 public data class Option(
     val id: String,
     val text: String,
+    val extraData: Map<String, Any> = emptyMap(),
 )
 
 /**
  * The PollConfig object is used to configure a poll.
  *
  * @property name The name of the poll.
- * @property options The list of options for the poll.
  * @property description The description of the poll.
- * @property votingVisibility The visibility of the votes. Default is [VotingVisibility.PUBLIC].
+ * @property votingVisibility The visibility of the votes.
  * If set to [VotingVisibility.ANONYMOUS], the votes will be anonymous.
- * @property enforceUniqueVote If set to true, a user can only vote once. Default is true.
- * @property maxVotesAllowed The maximum number of votes a user can cast. Default is 1.
- * @property allowUserSuggestedOptions If set to true, users can suggest new options. Default is false.
- * @property allowAnswers If set to true, users can send answers. Default is false.
+ * @property enforceUniqueVote If set to true, a user can only vote once.
+ * @property maxVotesAllowed The maximum number of votes a user can cast.
+ * @property allowUserSuggestedOptions If set to true, users can suggest new options.
+ * @property allowAnswers If set to true, users can send answers.
+ * @property extraData Any additional data associated with the poll.
+ * @property optionsWithExtraData The list of options for the poll.
  */
-public data class PollConfig(
+public data class PollConfig internal constructor(
     val name: String,
-    val options: List<String>,
-    val description: String = "",
-    val votingVisibility: VotingVisibility = VotingVisibility.PUBLIC,
-    val enforceUniqueVote: Boolean = true,
-    val maxVotesAllowed: Int = 1,
-    val allowUserSuggestedOptions: Boolean = false,
-    val allowAnswers: Boolean = false,
+    val description: String,
+    val votingVisibility: VotingVisibility,
+    val enforceUniqueVote: Boolean,
+    val maxVotesAllowed: Int,
+    val allowUserSuggestedOptions: Boolean,
+    val allowAnswers: Boolean,
+    val extraData: Map<String, Any>,
+    @InternalStreamChatApi
+    val optionsWithExtraData: List<PollOption>,
+) {
+
+    /**
+     * Constructor to create a PollConfig with a list of option texts.
+     *
+     * @param name The name of the poll.
+     * @param options The list of option texts for the poll.
+     * @param description The description of the poll. Default: empty.
+     * @param votingVisibility The visibility of the votes. Default: [VotingVisibility.PUBLIC].
+     * @param enforceUniqueVote If set to true, a user can only vote once. Default: true.
+     * @param maxVotesAllowed The maximum number of votes a user can cast. Default: 1.
+     * @param allowUserSuggestedOptions If set to true, users can suggest new options. Default: false.
+     * @param allowAnswers If set to true, users can send answers. Default: false.
+     */
+    @Deprecated(
+        "This constructor doesn't allow passing extra data for options. " +
+            "Use the constructor with List<PollOption> instead.",
+    )
+    public constructor(
+        name: String,
+        options: List<String>,
+        description: String = "",
+        votingVisibility: VotingVisibility = VotingVisibility.PUBLIC,
+        enforceUniqueVote: Boolean = true,
+        maxVotesAllowed: Int = 1,
+        allowUserSuggestedOptions: Boolean = false,
+        allowAnswers: Boolean = false,
+    ) : this(
+        name = name,
+        optionsWithExtraData = options.map { PollOption(it) },
+        description = description,
+        votingVisibility = votingVisibility,
+        enforceUniqueVote = enforceUniqueVote,
+        maxVotesAllowed = maxVotesAllowed,
+        allowUserSuggestedOptions = allowUserSuggestedOptions,
+        allowAnswers = allowAnswers,
+        extraData = emptyMap(),
+    )
+
+    /**
+     * Alternative constructor to create a PollConfig with a list of options with extra data.
+     *
+     * @param name The name of the poll.
+     * @param options The list of options (with optional extra data) for the poll.
+     * @param description The description of the poll. Default: empty.
+     * @param votingVisibility The visibility of the votes. Default: [VotingVisibility.PUBLIC].
+     * @param enforceUniqueVote If set to true, a user can only vote once. Default: true.
+     * @param maxVotesAllowed The maximum number of votes a user can cast. Default: 1.
+     * @param allowUserSuggestedOptions If set to true, users can suggest new options. Default: false.
+     * @param allowAnswers If set to true, users can send answers. Default: false.
+     * @param extraData Any additional data associated with the poll.
+     */
+    public constructor(
+        name: String,
+        options: List<PollOption>,
+        description: String = "",
+        votingVisibility: VotingVisibility = VotingVisibility.PUBLIC,
+        enforceUniqueVote: Boolean = true,
+        maxVotesAllowed: Int = 1,
+        allowUserSuggestedOptions: Boolean = false,
+        allowAnswers: Boolean = false,
+        extraData: Map<String, Any> = emptyMap(),
+    ) : this(
+        name = name,
+        optionsWithExtraData = options,
+        description = description,
+        votingVisibility = votingVisibility,
+        enforceUniqueVote = enforceUniqueVote,
+        maxVotesAllowed = maxVotesAllowed,
+        allowUserSuggestedOptions = allowUserSuggestedOptions,
+        allowAnswers = allowAnswers,
+        extraData = extraData,
+    )
+
+    /**
+     * The list of option texts for the poll.
+     */
+    public val options: List<String>
+        get() = optionsWithExtraData.map { it.text }
+}
+
+/**
+ * Model representing the input required to create a poll option.
+ *
+ * @property text The text of the option.
+ * @property extraData Any additional data associated with the option.
+ */
+public data class PollOption(
+    val text: String,
+    val extraData: Map<String, Any> = emptyMap(),
 )
 
 /**
@@ -143,7 +257,13 @@ public data class Vote(
     val createdAt: Date,
     val updatedAt: Date,
     val user: User?,
-)
+) : ComparableFieldProvider {
+
+    override fun getComparableField(fieldName: String): Comparable<*>? = when (fieldName) {
+        "created_at", "createdAt" -> createdAt
+        else -> null
+    }
+}
 
 /**
  * Represents the visibility of the votes.
diff --git a/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/QueryPollVotesResult.kt b/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/QueryPollVotesResult.kt
new file mode 100644
index 00000000000..da9e0a27a24
--- /dev/null
+++ b/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/QueryPollVotesResult.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.models
+
+/**
+ * Model representing the result of a 'Query Poll Votes' operation.
+ *
+ * @property votes The list of votes matching the query.
+ * @property next The pagination token for fetching the next set of results.
+ */
+public data class QueryPollVotesResult(
+    val votes: List<Vote>,
+    val next: String?,
+)
diff --git a/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/QueryPollsResult.kt b/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/QueryPollsResult.kt
new file mode 100644
index 00000000000..dad6d75c99f
--- /dev/null
+++ b/stream-chat-android-core/src/main/java/io/getstream/chat/android/models/QueryPollsResult.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.models
+
+/**
+ * Model representing the result of a 'Query Polls' operation.
+ *
+ * @property polls The list of polls matching the query.
+ * @property next The pagination token for fetching the next set of results.
+ */
+public data class QueryPollsResult(
+    val polls: List<Poll>,
+    val next: String?,
+)
diff --git a/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/PollConfigTest.kt b/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/PollConfigTest.kt
new file mode 100644
index 00000000000..a7ea364e5c7
--- /dev/null
+++ b/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/PollConfigTest.kt
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.models
+
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+internal class PollConfigTest {
+
+    @Test
+    fun `deprecated constructor with List of Strings properly maps parameters to default constructor`() {
+        val name = "Test Poll"
+        val options = listOf("Option 1", "Option 2", "Option 3")
+        val description = "Test Description"
+        val votingVisibility = VotingVisibility.ANONYMOUS
+        val enforceUniqueVote = false
+        val maxVotesAllowed = 5
+        val allowUserSuggestedOptions = true
+        val allowAnswers = true
+
+        @Suppress("DEPRECATION")
+        val pollConfig = PollConfig(
+            name = name,
+            options = options,
+            description = description,
+            votingVisibility = votingVisibility,
+            enforceUniqueVote = enforceUniqueVote,
+            maxVotesAllowed = maxVotesAllowed,
+            allowUserSuggestedOptions = allowUserSuggestedOptions,
+            allowAnswers = allowAnswers,
+        )
+
+        Assertions.assertEquals(name, pollConfig.name)
+        Assertions.assertEquals(description, pollConfig.description)
+        Assertions.assertEquals(votingVisibility, pollConfig.votingVisibility)
+        Assertions.assertEquals(enforceUniqueVote, pollConfig.enforceUniqueVote)
+        Assertions.assertEquals(maxVotesAllowed, pollConfig.maxVotesAllowed)
+        Assertions.assertEquals(allowUserSuggestedOptions, pollConfig.allowUserSuggestedOptions)
+        Assertions.assertEquals(allowAnswers, pollConfig.allowAnswers)
+        Assertions.assertEquals(options, pollConfig.options)
+        Assertions.assertEquals(emptyMap<String, Any>(), pollConfig.extraData)
+        Assertions.assertEquals(
+            options.map { PollOption(it) },
+            pollConfig.optionsWithExtraData,
+        )
+    }
+
+    @Test
+    fun `deprecated constructor with defaults applies default values correctly`() {
+        val name = "Simple Poll"
+        val options = listOf("Yes", "No")
+
+        @Suppress("DEPRECATION")
+        val pollConfig = PollConfig(
+            name = name,
+            options = options,
+        )
+
+        Assertions.assertEquals(name, pollConfig.name)
+        Assertions.assertEquals("", pollConfig.description)
+        Assertions.assertEquals(VotingVisibility.PUBLIC, pollConfig.votingVisibility)
+        Assertions.assertEquals(true, pollConfig.enforceUniqueVote)
+        Assertions.assertEquals(1, pollConfig.maxVotesAllowed)
+        Assertions.assertEquals(false, pollConfig.allowUserSuggestedOptions)
+        Assertions.assertEquals(false, pollConfig.allowAnswers)
+        Assertions.assertEquals(options, pollConfig.options)
+        Assertions.assertEquals(emptyMap<String, Any>(), pollConfig.extraData)
+    }
+
+    @Test
+    fun `new constructor with List of PollOptions properly maps parameters to default constructor`() {
+        val name = "Poll With Extra Data"
+        val option1 = PollOption("Option A", mapOf("color" to "red"))
+        val option2 = PollOption("Option B", mapOf("color" to "blue"))
+        val options = listOf(option1, option2)
+        val description = "Poll Description"
+        val votingVisibility = VotingVisibility.PUBLIC
+        val enforceUniqueVote = true
+        val maxVotesAllowed = 3
+        val allowUserSuggestedOptions = false
+        val allowAnswers = true
+        val extraData = mapOf("priority" to "high", "category" to "survey")
+
+        val pollConfig = PollConfig(
+            name = name,
+            options = options,
+            description = description,
+            votingVisibility = votingVisibility,
+            enforceUniqueVote = enforceUniqueVote,
+            maxVotesAllowed = maxVotesAllowed,
+            allowUserSuggestedOptions = allowUserSuggestedOptions,
+            allowAnswers = allowAnswers,
+            extraData = extraData,
+        )
+
+        Assertions.assertEquals(name, pollConfig.name)
+        Assertions.assertEquals(description, pollConfig.description)
+        Assertions.assertEquals(votingVisibility, pollConfig.votingVisibility)
+        Assertions.assertEquals(enforceUniqueVote, pollConfig.enforceUniqueVote)
+        Assertions.assertEquals(maxVotesAllowed, pollConfig.maxVotesAllowed)
+        Assertions.assertEquals(allowUserSuggestedOptions, pollConfig.allowUserSuggestedOptions)
+        Assertions.assertEquals(allowAnswers, pollConfig.allowAnswers)
+        Assertions.assertEquals(options, pollConfig.optionsWithExtraData)
+        Assertions.assertEquals(extraData, pollConfig.extraData)
+        Assertions.assertEquals(listOf("Option A", "Option B"), pollConfig.options)
+    }
+
+    @Test
+    fun `new constructor with defaults applies default values correctly`() {
+        val name = "Minimal Poll"
+        val options = listOf(
+            PollOption("Option 1"),
+            PollOption("Option 2"),
+        )
+
+        val pollConfig = PollConfig(
+            name = name,
+            options = options,
+        )
+
+        Assertions.assertEquals(name, pollConfig.name)
+        Assertions.assertEquals("", pollConfig.description)
+        Assertions.assertEquals(VotingVisibility.PUBLIC, pollConfig.votingVisibility)
+        Assertions.assertEquals(true, pollConfig.enforceUniqueVote)
+        Assertions.assertEquals(1, pollConfig.maxVotesAllowed)
+        Assertions.assertEquals(false, pollConfig.allowUserSuggestedOptions)
+        Assertions.assertEquals(false, pollConfig.allowAnswers)
+        Assertions.assertEquals(options, pollConfig.optionsWithExtraData)
+        Assertions.assertEquals(emptyMap<String, Any>(), pollConfig.extraData)
+    }
+
+    @Test
+    fun `options property getter extracts text from optionsWithExtraData correctly`() {
+        val options = listOf(
+            PollOption("First", mapOf("id" to 1)),
+            PollOption("Second", mapOf("id" to 2)),
+            PollOption("Third", mapOf("id" to 3)),
+        )
+
+        val pollConfig = PollConfig(
+            name = "Test",
+            options = options,
+        )
+
+        Assertions.assertEquals(listOf("First", "Second", "Third"), pollConfig.options)
+    }
+
+    @Test
+    fun `deprecated constructor creates PollOption objects with empty extra data`() {
+        val optionTexts = listOf("Choice 1", "Choice 2", "Choice 3")
+
+        @Suppress("DEPRECATION")
+        val pollConfig = PollConfig(
+            name = "Test",
+            options = optionTexts,
+        )
+
+        pollConfig.optionsWithExtraData.forEach { option ->
+            Assertions.assertEquals(emptyMap<String, Any>(), option.extraData)
+        }
+    }
+
+    @Test
+    fun `all parameters are preserved through constructor chain`() {
+        val name = "Complete Poll"
+        val options = listOf(
+            PollOption("Option 1", mapOf("order" to 1)),
+            PollOption("Option 2", mapOf("order" to 2)),
+        )
+        val description = "Complete Description"
+        val votingVisibility = VotingVisibility.ANONYMOUS
+        val enforceUniqueVote = false
+        val maxVotesAllowed = 10
+        val allowUserSuggestedOptions = true
+        val allowAnswers = false
+        val extraData = mapOf("testKey" to "testValue")
+
+        val pollConfig = PollConfig(
+            name = name,
+            options = options,
+            description = description,
+            votingVisibility = votingVisibility,
+            enforceUniqueVote = enforceUniqueVote,
+            maxVotesAllowed = maxVotesAllowed,
+            allowUserSuggestedOptions = allowUserSuggestedOptions,
+            allowAnswers = allowAnswers,
+            extraData = extraData,
+        )
+
+        // Verify all properties are correctly set
+        Assertions.assertEquals(name, pollConfig.name)
+        Assertions.assertEquals(description, pollConfig.description)
+        Assertions.assertEquals(votingVisibility, pollConfig.votingVisibility)
+        Assertions.assertEquals(enforceUniqueVote, pollConfig.enforceUniqueVote)
+        Assertions.assertEquals(maxVotesAllowed, pollConfig.maxVotesAllowed)
+        Assertions.assertEquals(allowUserSuggestedOptions, pollConfig.allowUserSuggestedOptions)
+        Assertions.assertEquals(allowAnswers, pollConfig.allowAnswers)
+        Assertions.assertEquals(options, pollConfig.optionsWithExtraData)
+        Assertions.assertEquals(extraData, pollConfig.extraData)
+
+        // Verify derived properties
+        Assertions.assertEquals(
+            mapOf("Option 1" to "order:1", "Option 2" to "order:2"),
+            pollConfig.options.zip(options).associate { (text, option) ->
+                text to option.extraData.entries.joinToString(":") { "${it.key}:${it.value}" }
+            },
+        )
+    }
+}
diff --git a/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/PollTest.kt b/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/PollTest.kt
new file mode 100644
index 00000000000..2bbcd9361d0
--- /dev/null
+++ b/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/PollTest.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.models
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Test
+import java.util.Date
+
+internal class PollTest {
+
+    private val pollId = "poll-123"
+    private val pollName = "Test Poll"
+    private val createdAt = Date(1000000)
+    private val updatedAt = Date(2000000)
+    private val isClosed = false
+
+    private val poll = Poll(
+        id = pollId,
+        name = pollName,
+        description = "Test poll description",
+        options = listOf(
+            Option(id = "opt1", text = "Option 1"),
+            Option(id = "opt2", text = "Option 2"),
+        ),
+        votingVisibility = VotingVisibility.PUBLIC,
+        enforceUniqueVote = true,
+        maxVotesAllowed = 1,
+        allowUserSuggestedOptions = false,
+        allowAnswers = false,
+        voteCount = 5,
+        voteCountsByOption = mapOf("opt1" to 3, "opt2" to 2),
+        votes = emptyList(),
+        ownVotes = emptyList(),
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+        closed = isClosed,
+        answersCount = 0,
+        answers = emptyList(),
+        createdBy = null,
+        extraData = emptyMap(),
+    )
+
+    @Test
+    fun `getComparableField should return id for 'id' field name`() {
+        val result = poll.getComparableField("id")
+        assertEquals(pollId, result)
+    }
+
+    @Test
+    fun `getComparableField should return name for 'name' field name`() {
+        val result = poll.getComparableField("name")
+        assertEquals(pollName, result)
+    }
+
+    @Test
+    fun `getComparableField should return createdAt for snake_case field name 'created_at'`() {
+        val result = poll.getComparableField("created_at")
+        assertEquals(createdAt, result)
+    }
+
+    @Test
+    fun `getComparableField should return createdAt for camelCase field name 'createdAt'`() {
+        val result = poll.getComparableField("createdAt")
+        assertEquals(createdAt, result)
+    }
+
+    @Test
+    fun `getComparableField should return updatedAt for snake_case field name 'updated_at'`() {
+        val result = poll.getComparableField("updated_at")
+        assertEquals(updatedAt, result)
+    }
+
+    @Test
+    fun `getComparableField should return updatedAt for camelCase field name 'updatedAt'`() {
+        val result = poll.getComparableField("updatedAt")
+        assertEquals(updatedAt, result)
+    }
+
+    @Test
+    fun `getComparableField should return closed boolean for snake_case field name 'is_closed'`() {
+        val result = poll.getComparableField("is_closed")
+        assertEquals(isClosed, result)
+    }
+
+    @Test
+    fun `getComparableField should return closed boolean for camelCase field name 'isClosed'`() {
+        val result = poll.getComparableField("isClosed")
+        assertEquals(isClosed, result)
+    }
+
+    @Test
+    fun `getComparableField should return closed=true when poll is closed`() {
+        val closedPoll = poll.copy(closed = true)
+        val result = closedPoll.getComparableField("isClosed")
+        assertEquals(true, result)
+    }
+
+    @Test
+    fun `getComparableField should return null for unknown field name`() {
+        val result = poll.getComparableField("unknownField")
+        assertNull(result)
+    }
+
+    @Test
+    fun `getComparableField should be case-sensitive for field names`() {
+        val result1 = poll.getComparableField("ID")
+        val result2 = poll.getComparableField("Name")
+        val result3 = poll.getComparableField("CREATED_AT")
+        assertNull(result1)
+        assertNull(result2)
+        assertNull(result3)
+    }
+}
diff --git a/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/VoteTest.kt b/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/VoteTest.kt
new file mode 100644
index 00000000000..f9d0b84e2f8
--- /dev/null
+++ b/stream-chat-android-core/src/test/java/io/getstream/chat/android/models/VoteTest.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.models
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Test
+import java.util.Date
+
+internal class VoteTest {
+
+    private val voteId = "vote-123"
+    private val pollId = "poll-456"
+    private val optionId = "option-789"
+    private val createdAt = Date(1000000)
+    private val updatedAt = Date(2000000)
+
+    private val vote = Vote(
+        id = voteId,
+        pollId = pollId,
+        optionId = optionId,
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+        user = null,
+    )
+
+    @Test
+    fun `getComparableField should return createdAt for snake_case field name 'created_at'`() {
+        val result = vote.getComparableField("created_at")
+        assertEquals(createdAt, result)
+    }
+
+    @Test
+    fun `getComparableField should return createdAt for camelCase field name 'createdAt'`() {
+        val result = vote.getComparableField("createdAt")
+        assertEquals(createdAt, result)
+    }
+
+    @Test
+    fun `getComparableField should return null for unknown field name`() {
+        val result = vote.getComparableField("unknownField")
+        assertNull(result)
+    }
+
+    @Test
+    fun `getComparableField should return null for 'id' field since it's not comparable`() {
+        val result = vote.getComparableField("id")
+        assertNull(result)
+    }
+
+    @Test
+    fun `getComparableField should return null for 'pollId' field since it's not comparable`() {
+        val result = vote.getComparableField("pollId")
+        assertNull(result)
+    }
+
+    @Test
+    fun `getComparableField should return null for 'optionId' field since it's not comparable`() {
+        val result = vote.getComparableField("optionId")
+        assertNull(result)
+    }
+
+    @Test
+    fun `getComparableField should return null for 'user' field since it's not comparable`() {
+        val result = vote.getComparableField("user")
+        assertNull(result)
+    }
+
+    @Test
+    fun `getComparableField returns Date type for createdAt`() {
+        val result = vote.getComparableField("createdAt")
+        assertEquals(Date::class.java, result?.javaClass)
+    }
+}
diff --git a/stream-chat-android-core/src/testFixtures/kotlin/io/getstream/chat/android/Mother.kt b/stream-chat-android-core/src/testFixtures/kotlin/io/getstream/chat/android/Mother.kt
index 65c607760f7..4bac2c65738 100644
--- a/stream-chat-android-core/src/testFixtures/kotlin/io/getstream/chat/android/Mother.kt
+++ b/stream-chat-android-core/src/testFixtures/kotlin/io/getstream/chat/android/Mother.kt
@@ -50,6 +50,7 @@ import io.getstream.chat.android.models.Option
 import io.getstream.chat.android.models.PendingMessage
 import io.getstream.chat.android.models.Poll
 import io.getstream.chat.android.models.PollConfig
+import io.getstream.chat.android.models.PollOption
 import io.getstream.chat.android.models.PushProvider
 import io.getstream.chat.android.models.QueryDraftsResult
 import io.getstream.chat.android.models.QueryRemindersResult
@@ -834,7 +835,7 @@ public fun randomPollConfig(
 ): PollConfig = PollConfig(
     name = name,
     description = description,
-    options = options,
+    options = options.map(::PollOption),
     votingVisibility = votingVisibility,
     enforceUniqueVote = enforceUniqueVote,
     maxVotesAllowed = maxVotesAllowed,
@@ -849,6 +850,7 @@ public fun randomPoll(
     votingVisibility: VotingVisibility = VotingVisibility.PUBLIC,
     enforceUniqueVote: Boolean = randomBoolean(),
     maxVotesAllowed: Int = positiveRandomInt(),
+    voteCount: Int = positiveRandomInt(),
     voteCountsByOption: Map<String, Int> = emptyMap(),
     allowUserSuggestedOptions: Boolean = randomBoolean(),
     allowAnswers: Boolean = randomBoolean(),
@@ -858,7 +860,10 @@ public fun randomPoll(
     createdAt: Date = randomDate(),
     updatedAt: Date = randomDate(),
     closed: Boolean = randomBoolean(),
+    answersCount: Int = positiveRandomInt(),
     answers: List<Answer> = emptyList(),
+    createdBy: User = randomUser(),
+    extraData: Map<String, Any> = randomExtraData(1),
 ): Poll = Poll(
     id = id,
     name = name,
@@ -866,6 +871,7 @@ public fun randomPoll(
     votingVisibility = votingVisibility,
     enforceUniqueVote = enforceUniqueVote,
     maxVotesAllowed = maxVotesAllowed,
+    voteCount = voteCount,
     voteCountsByOption = voteCountsByOption,
     allowUserSuggestedOptions = allowUserSuggestedOptions,
     allowAnswers = allowAnswers,
@@ -875,7 +881,10 @@ public fun randomPoll(
     createdAt = createdAt,
     updatedAt = updatedAt,
     closed = closed,
+    answersCount = answersCount,
     answers = answers,
+    extraData = extraData,
+    createdBy = createdBy,
 )
 
 public fun randomPollOption(
diff --git a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/database/internal/ChatDatabase.kt b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/database/internal/ChatDatabase.kt
index ba6e9104dfb..94908b33bf0 100644
--- a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/database/internal/ChatDatabase.kt
+++ b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/database/internal/ChatDatabase.kt
@@ -87,7 +87,7 @@ import io.getstream.chat.android.offline.repository.domain.user.internal.UserEnt
         ThreadOrderEntity::class,
         DraftMessageEntity::class,
     ],
-    version = 95,
+    version = 96,
     exportSchema = false,
 )
 @TypeConverters(
diff --git a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/MessageMapper.kt b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/MessageMapper.kt
index 3e2eef8c9d1..8c89b0c0cc2 100644
--- a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/MessageMapper.kt
+++ b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/MessageMapper.kt
@@ -16,16 +16,12 @@
 
 package io.getstream.chat.android.offline.repository.domain.message.internal
 
-import io.getstream.chat.android.models.Answer
 import io.getstream.chat.android.models.DraftMessage
 import io.getstream.chat.android.models.Message
 import io.getstream.chat.android.models.MessageReminderInfo
-import io.getstream.chat.android.models.Option
 import io.getstream.chat.android.models.Poll
 import io.getstream.chat.android.models.Reaction
 import io.getstream.chat.android.models.User
-import io.getstream.chat.android.models.Vote
-import io.getstream.chat.android.models.VotingVisibility
 import io.getstream.chat.android.offline.repository.domain.message.attachment.internal.AttachmentEntity
 import io.getstream.chat.android.offline.repository.domain.message.attachment.internal.toEntity
 import io.getstream.chat.android.offline.repository.domain.message.attachment.internal.toModel
@@ -232,107 +228,6 @@ internal fun Message.toReplyEntity(): ReplyMessageEntity =
         attachments = attachments.mapIndexed { index, attachment -> attachment.toReplyEntity(id, index) },
     )
 
-internal fun Poll.toEntity(): PollEntity = PollEntity(
-    id = id,
-    name = name,
-    description = description,
-    options = options.map { it.toEntity() },
-    votes = votes.map { it.toEntity() },
-    createdAt = createdAt,
-    updatedAt = updatedAt,
-    votingVisibility = votingVisibility.toEntity(),
-    enforceUniqueVote = enforceUniqueVote,
-    maxVotesAllowed = maxVotesAllowed,
-    allowUserSuggestedOptions = allowUserSuggestedOptions,
-    allowAnswers = allowAnswers,
-    voteCountsByOption = voteCountsByOption,
-    ownVotes = ownVotes.map { it.toEntity() },
-    closed = closed,
-    answers = answers.map { it.toEntity() },
-)
-
-internal fun Option.toEntity(): OptionEntity = OptionEntity(
-    id = id,
-    text = text,
-)
-
-internal fun Vote.toEntity(): VoteEntity = VoteEntity(
-    id = id,
-    optionId = optionId,
-    pollId = pollId,
-    createdAt = createdAt,
-    updatedAt = updatedAt,
-    userId = user?.id,
-)
-
-private fun Answer.toEntity(): AnswerEntity = AnswerEntity(
-    id = id,
-    pollId = pollId,
-    text = text,
-    createdAt = createdAt,
-    updatedAt = updatedAt,
-    userId = user?.id,
-)
-
-private fun VotingVisibility.toEntity(): String = when (this) {
-    VotingVisibility.ANONYMOUS -> "anonymous"
-    VotingVisibility.PUBLIC -> "public"
-}
-
-internal suspend fun PollEntity.toModel(
-    getUser: suspend (userId: String) -> User,
-): Poll = Poll(
-    id = id,
-    name = name,
-    description = description,
-    options = options.map(OptionEntity::toModel),
-    votes = votes.map { it.toModel(getUser) },
-    createdAt = createdAt,
-    updatedAt = updatedAt,
-    votingVisibility = votingVisibility.toVotingVisibility(),
-    enforceUniqueVote = enforceUniqueVote,
-    maxVotesAllowed = maxVotesAllowed,
-    allowUserSuggestedOptions = allowUserSuggestedOptions,
-    allowAnswers = allowAnswers,
-    voteCountsByOption = voteCountsByOption,
-    ownVotes = ownVotes.map { it.toModel(getUser) },
-    closed = closed,
-    answers = answers.map { it.toModel(getUser) },
-)
-
-private fun OptionEntity.toModel(): Option = Option(
-    id = id,
-    text = text,
-)
-
-private suspend fun VoteEntity.toModel(
-    getUser: suspend (userId: String) -> User,
-): Vote = Vote(
-    id = id,
-    optionId = optionId,
-    pollId = pollId,
-    createdAt = createdAt,
-    updatedAt = updatedAt,
-    user = userId?.let { getUser(it) },
-)
-
-private suspend fun AnswerEntity.toModel(
-    getUser: suspend (userId: String) -> User,
-): Answer = Answer(
-    id = id,
-    pollId = pollId,
-    text = text,
-    createdAt = createdAt,
-    updatedAt = updatedAt,
-    user = userId?.let { getUser(it) },
-)
-
-private fun String.toVotingVisibility(): VotingVisibility = when (this) {
-    "public" -> VotingVisibility.PUBLIC
-    "anonymous" -> VotingVisibility.ANONYMOUS
-    else -> throw IllegalArgumentException("Unknown voting visibility: $this")
-}
-
 internal fun DraftMessage.toEntity(): DraftMessageEntity = DraftMessageEntity(
     id = id,
     cid = cid,
diff --git a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/Poll.kt b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/Poll.kt
index 7209835a86d..6de4a6e5577 100644
--- a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/Poll.kt
+++ b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/Poll.kt
@@ -34,19 +34,24 @@ internal class PollEntity(
     val maxVotesAllowed: Int,
     val allowUserSuggestedOptions: Boolean,
     val allowAnswers: Boolean,
+    val voteCount: Int,
     val voteCountsByOption: Map<String, Int>,
     val votes: List<VoteEntity>,
     val ownVotes: List<VoteEntity>,
     val createdAt: Date,
     val updatedAt: Date,
     val closed: Boolean,
+    val answersCount: Int,
     val answers: List<AnswerEntity>,
+    val createdById: String?,
+    val extraData: Map<String, Any>,
 )
 
 @JsonClass(generateAdapter = true)
 internal class OptionEntity(
     val id: String,
     val text: String,
+    val extraData: Map<String, Any>,
 )
 
 @JsonClass(generateAdapter = true)
diff --git a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/PollsMapper.kt b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/PollsMapper.kt
new file mode 100644
index 00000000000..68dcb3ccd52
--- /dev/null
+++ b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/internal/PollsMapper.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.offline.repository.domain.message.internal
+
+import io.getstream.chat.android.models.Answer
+import io.getstream.chat.android.models.Option
+import io.getstream.chat.android.models.Poll
+import io.getstream.chat.android.models.User
+import io.getstream.chat.android.models.Vote
+import io.getstream.chat.android.models.VotingVisibility
+
+/**
+ * Converts a [Poll] domain model to a [PollEntity] database entity.
+ *
+ * @return The converted [PollEntity].
+ */
+internal fun Poll.toEntity(): PollEntity = PollEntity(
+    id = id,
+    name = name,
+    description = description,
+    options = options.map { it.toEntity() },
+    votes = votes.map { it.toEntity() },
+    createdAt = createdAt,
+    updatedAt = updatedAt,
+    votingVisibility = votingVisibility.toEntity(),
+    enforceUniqueVote = enforceUniqueVote,
+    maxVotesAllowed = maxVotesAllowed,
+    allowUserSuggestedOptions = allowUserSuggestedOptions,
+    allowAnswers = allowAnswers,
+    voteCount = voteCount,
+    voteCountsByOption = voteCountsByOption,
+    ownVotes = ownVotes.map { it.toEntity() },
+    closed = closed,
+    answersCount = answersCount,
+    answers = answers.map { it.toEntity() },
+    createdById = createdBy?.id,
+    extraData = extraData,
+)
+
+/**
+ * Converts a [PollEntity] database entity to a [Poll] domain model.
+ *
+ * @param getUser A suspend function to retrieve a user by ID.
+ * @return The converted [Poll].
+ */
+internal suspend fun PollEntity.toModel(
+    getUser: suspend (userId: String) -> User,
+): Poll = Poll(
+    id = id,
+    name = name,
+    description = description,
+    options = options.map(OptionEntity::toModel),
+    votes = votes.map { it.toModel(getUser) },
+    createdAt = createdAt,
+    updatedAt = updatedAt,
+    votingVisibility = votingVisibility.toVotingVisibility(),
+    enforceUniqueVote = enforceUniqueVote,
+    maxVotesAllowed = maxVotesAllowed,
+    allowUserSuggestedOptions = allowUserSuggestedOptions,
+    allowAnswers = allowAnswers,
+    voteCount = voteCount,
+    voteCountsByOption = voteCountsByOption,
+    ownVotes = ownVotes.map { it.toModel(getUser) },
+    closed = closed,
+    answersCount = answersCount,
+    answers = answers.map { it.toModel(getUser) },
+    createdBy = createdById?.let { getUser(it) },
+    extraData = extraData,
+)
+
+/**
+ * Converts an [Option] domain model to an [OptionEntity] database entity.
+ *
+ * @return The converted [OptionEntity].
+ */
+internal fun Option.toEntity(): OptionEntity = OptionEntity(
+    id = id,
+    text = text,
+    extraData = extraData,
+)
+
+/**
+ * Converts an [OptionEntity] database entity to an [Option] domain model.
+ *
+ * @return The converted [Option].
+ */
+internal fun OptionEntity.toModel(): Option = Option(
+    id = id,
+    text = text,
+    extraData = extraData,
+)
+
+/**
+ * Converts a [Vote] domain model to a [VoteEntity] database entity.
+ *
+ * @return The converted [VoteEntity].
+ */
+internal fun Vote.toEntity(): VoteEntity = VoteEntity(
+    id = id,
+    optionId = optionId,
+    pollId = pollId,
+    createdAt = createdAt,
+    updatedAt = updatedAt,
+    userId = user?.id,
+)
+
+/**
+ * Converts a [VoteEntity] database entity to a [Vote] domain model.
+ *
+ * @param getUser A suspend function to retrieve a user by ID.
+ * @return The converted [Vote].
+ */
+internal suspend fun VoteEntity.toModel(
+    getUser: suspend (userId: String) -> User,
+): Vote = Vote(
+    id = id,
+    optionId = optionId,
+    pollId = pollId,
+    createdAt = createdAt,
+    updatedAt = updatedAt,
+    user = userId?.let { getUser(it) },
+)
+
+/**
+ * Converts an [Answer] domain model to an [AnswerEntity] database entity.
+ *
+ * @return The converted [AnswerEntity].
+ */
+internal fun Answer.toEntity(): AnswerEntity = AnswerEntity(
+    id = id,
+    pollId = pollId,
+    text = text,
+    createdAt = createdAt,
+    updatedAt = updatedAt,
+    userId = user?.id,
+)
+
+/**
+ * Converts an [AnswerEntity] database entity to an [Answer] domain model.
+ *
+ * @param getUser A suspend function to retrieve a user by ID.
+ * @return The converted [Answer].
+ */
+internal suspend fun AnswerEntity.toModel(
+    getUser: suspend (userId: String) -> User,
+): Answer = Answer(
+    id = id,
+    pollId = pollId,
+    text = text,
+    createdAt = createdAt,
+    updatedAt = updatedAt,
+    user = userId?.let { getUser(it) },
+)
+
+/**
+ * Converts a [VotingVisibility] domain enum to its string representation.
+ *
+ * @return The string representation of the voting visibility ("public" or "anonymous").
+ */
+internal fun VotingVisibility.toEntity(): String = when (this) {
+    VotingVisibility.ANONYMOUS -> "anonymous"
+    VotingVisibility.PUBLIC -> "public"
+}
+
+/**
+ * Converts a string representation to a [VotingVisibility] domain enum.
+ *
+ * @return The converted [VotingVisibility].
+ * @throws IllegalArgumentException if the string is not a recognized voting visibility.
+ */
+internal fun String.toVotingVisibility(): VotingVisibility = when (this) {
+    "public" -> VotingVisibility.PUBLIC
+    "anonymous" -> VotingVisibility.ANONYMOUS
+    else -> throw IllegalArgumentException("Unknown voting visibility: $this")
+}
diff --git a/stream-chat-android-offline/src/test/java/io/getstream/chat/android/offline/repository/domain/message/internal/PollsMapperTest.kt b/stream-chat-android-offline/src/test/java/io/getstream/chat/android/offline/repository/domain/message/internal/PollsMapperTest.kt
new file mode 100644
index 00000000000..712858cc270
--- /dev/null
+++ b/stream-chat-android-offline/src/test/java/io/getstream/chat/android/offline/repository/domain/message/internal/PollsMapperTest.kt
@@ -0,0 +1,361 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.getstream.chat.android.offline.repository.domain.message.internal
+
+import io.getstream.chat.android.models.Answer
+import io.getstream.chat.android.models.Option
+import io.getstream.chat.android.models.Poll
+import io.getstream.chat.android.models.User
+import io.getstream.chat.android.models.Vote
+import io.getstream.chat.android.models.VotingVisibility
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import java.util.Date
+
+internal class PollsMapperTest {
+
+    private val testUserId = "user-123"
+    private val testUser = User(
+        id = testUserId,
+        name = "Test User",
+        image = "https://example.com/image.jpg",
+    )
+
+    private val now = Date()
+    private val later = Date(now.time + 1000)
+
+    @Test
+    fun `Poll toEntity should convert domain model to entity correctly`() {
+        val poll = Poll(
+            id = "poll-123",
+            name = "Test Poll",
+            description = "Test Description",
+            options = listOf(
+                Option(id = "opt-1", text = "Option 1"),
+                Option(id = "opt-2", text = "Option 2"),
+            ),
+            votingVisibility = VotingVisibility.PUBLIC,
+            enforceUniqueVote = true,
+            maxVotesAllowed = 1,
+            allowUserSuggestedOptions = false,
+            allowAnswers = true,
+            voteCount = 5,
+            voteCountsByOption = mapOf("opt-1" to 3, "opt-2" to 2),
+            votes = emptyList(),
+            ownVotes = emptyList(),
+            createdAt = now,
+            updatedAt = later,
+            closed = false,
+            answersCount = 0,
+            answers = emptyList(),
+            createdBy = testUser,
+            extraData = mapOf("custom" to "value"),
+        )
+
+        val entity = poll.toEntity()
+
+        assertEquals("poll-123", entity.id)
+        assertEquals("Test Poll", entity.name)
+        assertEquals("Test Description", entity.description)
+        assertEquals(2, entity.options.size)
+        assertEquals("public", entity.votingVisibility)
+        assertTrue(entity.enforceUniqueVote)
+        assertEquals(1, entity.maxVotesAllowed)
+        assertEquals(false, entity.allowUserSuggestedOptions)
+        assertTrue(entity.allowAnswers)
+        assertEquals(5, entity.voteCount)
+        assertEquals(mapOf("opt-1" to 3, "opt-2" to 2), entity.voteCountsByOption)
+        assertEquals(now, entity.createdAt)
+        assertEquals(later, entity.updatedAt)
+        assertEquals(false, entity.closed)
+        assertEquals(0, entity.answersCount)
+        assertEquals(testUserId, entity.createdById)
+        assertEquals(mapOf("custom" to "value"), entity.extraData)
+    }
+
+    @Suppress("LongMethod")
+    @Test
+    fun `PollEntity toModel should convert entity to domain model correctly`() = runTest {
+        val options = listOf(
+            OptionEntity(id = "opt-1", text = "Option 1", extraData = emptyMap()),
+            OptionEntity(id = "opt-2", text = "Option 2", extraData = mapOf("key" to "value")),
+        )
+        val votes = listOf(
+            VoteEntity(id = "vote-1", pollId = "poll-123", optionId = "opt-1", createdAt = now, updatedAt = now, userId = testUserId),
+        )
+        val ownVotes = listOf(
+            VoteEntity(id = "own-vote-1", pollId = "poll-123", optionId = "opt-2", createdAt = now, updatedAt = now, userId = testUserId),
+        )
+        val answers = listOf(
+            AnswerEntity(id = "ans-1", pollId = "poll-123", text = "Custom answer", createdAt = now, updatedAt = now, userId = testUserId),
+        )
+        val entity = PollEntity(
+            id = "poll-123",
+            name = "Test Poll",
+            description = "Test Description",
+            options = options,
+            votingVisibility = "public",
+            enforceUniqueVote = true,
+            maxVotesAllowed = 1,
+            allowUserSuggestedOptions = false,
+            allowAnswers = true,
+            voteCount = 5,
+            voteCountsByOption = mapOf("opt-1" to 3, "opt-2" to 2),
+            votes = votes,
+            ownVotes = ownVotes,
+            createdAt = now,
+            updatedAt = later,
+            closed = false,
+            answersCount = 1,
+            answers = answers,
+            createdById = testUserId,
+            extraData = mapOf("custom" to "value"),
+        )
+
+        val poll = entity.toModel { userId ->
+            if (userId == testUserId) testUser else throw IllegalArgumentException("Unknown user")
+        }
+
+        assertEquals("poll-123", poll.id)
+        assertEquals("Test Poll", poll.name)
+        assertEquals("Test Description", poll.description)
+        assertEquals(2, poll.options.size)
+        assertEquals(VotingVisibility.PUBLIC, poll.votingVisibility)
+        assertTrue(poll.enforceUniqueVote)
+        assertEquals(1, poll.maxVotesAllowed)
+        assertEquals(false, poll.allowUserSuggestedOptions)
+        assertTrue(poll.allowAnswers)
+        assertEquals(5, poll.voteCount)
+        assertEquals(mapOf("opt-1" to 3, "opt-2" to 2), poll.voteCountsByOption)
+        assertEquals(1, poll.votes.size)
+        assertEquals(1, poll.ownVotes.size)
+        assertEquals(now, poll.createdAt)
+        assertEquals(later, poll.updatedAt)
+        assertEquals(false, poll.closed)
+        assertEquals(1, poll.answersCount)
+        assertEquals(1, poll.answers.size)
+        assertEquals(testUser, poll.createdBy)
+        assertEquals(mapOf("custom" to "value"), poll.extraData)
+    }
+
+    @Test
+    fun `Option toEntity should convert domain model to entity correctly`() {
+        val option = Option(
+            id = "opt-1",
+            text = "Option 1",
+            extraData = mapOf("key1" to "value1", "key2" to "value2"),
+        )
+
+        val entity = option.toEntity()
+
+        assertEquals("opt-1", entity.id)
+        assertEquals("Option 1", entity.text)
+        assertEquals(mapOf("key1" to "value1", "key2" to "value2"), entity.extraData)
+    }
+
+    @Test
+    fun `OptionEntity toModel should convert entity to domain model correctly`() {
+        val entity = OptionEntity(
+            id = "opt-1",
+            text = "Option 1",
+            extraData = mapOf("key" to "value"),
+        )
+
+        val option = entity.toModel()
+
+        assertEquals("opt-1", option.id)
+        assertEquals("Option 1", option.text)
+        assertEquals(mapOf("key" to "value"), option.extraData)
+    }
+
+    @Test
+    fun `Vote toEntity should convert domain model to entity correctly`() {
+        val vote = Vote(
+            id = "vote-1",
+            optionId = "opt-1",
+            pollId = "poll-1",
+            createdAt = now,
+            updatedAt = later,
+            user = testUser,
+        )
+
+        val entity = vote.toEntity()
+
+        assertEquals("vote-1", entity.id)
+        assertEquals("opt-1", entity.optionId)
+        assertEquals("poll-1", entity.pollId)
+        assertEquals(now, entity.createdAt)
+        assertEquals(later, entity.updatedAt)
+        assertEquals(testUserId, entity.userId)
+    }
+
+    @Test
+    fun `VoteEntity toModel should convert entity to domain model correctly`() = runTest {
+        val entity = VoteEntity(
+            id = "vote-1",
+            pollId = "poll-1",
+            optionId = "opt-1",
+            createdAt = now,
+            updatedAt = later,
+            userId = testUserId,
+        )
+
+        val vote = entity.toModel { userId ->
+            if (userId == testUserId) testUser else throw IllegalArgumentException("Unknown user")
+        }
+
+        assertEquals("vote-1", vote.id)
+        assertEquals("poll-1", vote.pollId)
+        assertEquals("opt-1", vote.optionId)
+        assertEquals(now, vote.createdAt)
+        assertEquals(later, vote.updatedAt)
+        assertEquals(testUser, vote.user)
+    }
+
+    @Test
+    fun `Answer toEntity should convert domain model to entity correctly`() {
+        val answer = Answer(
+            id = "ans-1",
+            pollId = "poll-1",
+            text = "Custom answer text",
+            createdAt = now,
+            updatedAt = later,
+            user = testUser,
+        )
+
+        val entity = answer.toEntity()
+
+        assertEquals("ans-1", entity.id)
+        assertEquals("poll-1", entity.pollId)
+        assertEquals("Custom answer text", entity.text)
+        assertEquals(now, entity.createdAt)
+        assertEquals(later, entity.updatedAt)
+        assertEquals(testUserId, entity.userId)
+    }
+
+    @Test
+    fun `AnswerEntity toModel should convert entity to domain model correctly`() = runTest {
+        val entity = AnswerEntity(
+            id = "ans-1",
+            pollId = "poll-1",
+            text = "Custom answer text",
+            createdAt = now,
+            updatedAt = later,
+            userId = testUserId,
+        )
+
+        val answer = entity.toModel { userId ->
+            if (userId == testUserId) testUser else throw IllegalArgumentException("Unknown user")
+        }
+
+        assertEquals("ans-1", answer.id)
+        assertEquals("poll-1", answer.pollId)
+        assertEquals("Custom answer text", answer.text)
+        assertEquals(now, answer.createdAt)
+        assertEquals(later, answer.updatedAt)
+        assertEquals(testUser, answer.user)
+    }
+
+    @Test
+    fun `VotingVisibility PUBLIC toEntity should return 'public'`() {
+        val visibility = VotingVisibility.PUBLIC
+        val result = visibility.toEntity()
+        assertEquals("public", result)
+    }
+
+    @Test
+    fun `VotingVisibility ANONYMOUS toEntity should return 'anonymous'`() {
+        val visibility = VotingVisibility.ANONYMOUS
+        val result = visibility.toEntity()
+        assertEquals("anonymous", result)
+    }
+
+    @Test
+    fun `String 'public' toVotingVisibility should return PUBLIC`() {
+        val result = "public".toVotingVisibility()
+        assertEquals(VotingVisibility.PUBLIC, result)
+    }
+
+    @Test
+    fun `String 'anonymous' toVotingVisibility should return ANONYMOUS`() {
+        val result = "anonymous".toVotingVisibility()
+        assertEquals(VotingVisibility.ANONYMOUS, result)
+    }
+
+    @Test
+    fun `String with unknown visibility toVotingVisibility should throw IllegalArgumentException`() {
+        assertThrows(IllegalArgumentException::class.java) {
+            "unknown".toVotingVisibility()
+        }
+    }
+
+    @Test
+    fun `Poll round-trip conversion should preserve all data`() = runTest {
+        val originalPoll = Poll(
+            id = "poll-roundtrip",
+            name = "Round Trip Poll",
+            description = "Testing round trip conversion",
+            options = listOf(
+                Option(id = "opt-1", text = "Option 1", extraData = emptyMap()),
+                Option(id = "opt-2", text = "Option 2", extraData = mapOf("rating" to 5)),
+            ),
+            votingVisibility = VotingVisibility.PUBLIC,
+            enforceUniqueVote = true,
+            maxVotesAllowed = 2,
+            allowUserSuggestedOptions = true,
+            allowAnswers = false,
+            voteCount = 10,
+            voteCountsByOption = mapOf("opt-1" to 6, "opt-2" to 4),
+            votes = listOf(
+                Vote(id = "v-1", optionId = "opt-1", pollId = "poll-roundtrip", createdAt = now, updatedAt = now, user = testUser),
+            ),
+            ownVotes = listOf(
+                Vote(id = "ov-1", optionId = "opt-2", pollId = "poll-roundtrip", createdAt = now, updatedAt = now, user = testUser),
+            ),
+            createdAt = now,
+            updatedAt = later,
+            closed = false,
+            answersCount = 2,
+            answers = listOf(
+                Answer(id = "a-1", pollId = "poll-roundtrip", text = "Answer 1", createdAt = now, updatedAt = now, user = testUser),
+            ),
+            createdBy = testUser,
+            extraData = mapOf("source" to "test"),
+        )
+
+        val entity = originalPoll.toEntity()
+        val resultPoll = entity.toModel { userId ->
+            if (userId == testUserId) testUser else throw IllegalArgumentException("Unknown user")
+        }
+
+        assertEquals(originalPoll.id, resultPoll.id)
+        assertEquals(originalPoll.name, resultPoll.name)
+        assertEquals(originalPoll.description, resultPoll.description)
+        assertEquals(originalPoll.options.size, resultPoll.options.size)
+        assertEquals(originalPoll.votingVisibility, resultPoll.votingVisibility)
+        assertEquals(originalPoll.enforceUniqueVote, resultPoll.enforceUniqueVote)
+        assertEquals(originalPoll.maxVotesAllowed, resultPoll.maxVotesAllowed)
+        assertEquals(originalPoll.voteCount, resultPoll.voteCount)
+        assertEquals(originalPoll.closed, resultPoll.closed)
+        assertEquals(originalPoll.extraData, resultPoll.extraData)
+    }
+
+    // endregion
+}
diff --git a/stream-chat-android-previewdata/src/main/kotlin/io/getstream/chat/android/previewdata/PreviewPollData.kt b/stream-chat-android-previewdata/src/main/kotlin/io/getstream/chat/android/previewdata/PreviewPollData.kt
index d1b45e69ffa..9958494dfb9 100644
--- a/stream-chat-android-previewdata/src/main/kotlin/io/getstream/chat/android/previewdata/PreviewPollData.kt
+++ b/stream-chat-android-previewdata/src/main/kotlin/io/getstream/chat/android/previewdata/PreviewPollData.kt
@@ -53,6 +53,7 @@ public object PreviewPollData {
         maxVotesAllowed = 1,
         allowUserSuggestedOptions = false,
         allowAnswers = true,
+        voteCount = 5,
         voteCountsByOption = mapOf(
             option1.id to 3,
             option2.id to 1,
@@ -104,6 +105,8 @@ public object PreviewPollData {
         createdAt = Now,
         updatedAt = Now,
         closed = false,
+        answersCount = 0,
+        createdBy = null,
     )
 }
 
diff --git a/stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/messages/list/MessageListController.kt b/stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/messages/list/MessageListController.kt
index 2aa6f08e79f..de34218b437 100644
--- a/stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/messages/list/MessageListController.kt
+++ b/stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/messages/list/MessageListController.kt
@@ -18,6 +18,7 @@ package io.getstream.chat.android.ui.common.feature.messages.list
 
 import androidx.annotation.VisibleForTesting
 import io.getstream.chat.android.client.ChatClient
+import io.getstream.chat.android.client.api.models.CreatePollOptionRequest
 import io.getstream.chat.android.client.audio.AudioState
 import io.getstream.chat.android.client.audio.audioHash
 import io.getstream.chat.android.client.channel.state.ChannelState
@@ -2417,9 +2418,15 @@ public class MessageListController(
         }
     }
 
+    /**
+     * Creates a new poll option for the given poll.
+     *
+     * @param poll The poll to which the option will be added.
+     * @param option The text of the new option to be added.
+     */
     public fun addPollOption(poll: Poll, option: String) {
         scope.launch {
-            chatClient.suggestPollOption(poll.id, option).await()
+            chatClient.createPollOption(poll.id, CreatePollOptionRequest(option)).await()
         }
     }
 
diff --git a/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/composer/attachment/picker/poll/CreatePollViewModel.kt b/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/composer/attachment/picker/poll/CreatePollViewModel.kt
index cb1573740a3..ff267a91d9b 100644
--- a/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/composer/attachment/picker/poll/CreatePollViewModel.kt
+++ b/stream-chat-android-ui-components/src/main/kotlin/io/getstream/chat/android/ui/feature/messages/composer/attachment/picker/poll/CreatePollViewModel.kt
@@ -19,6 +19,7 @@ package io.getstream.chat.android.ui.feature.messages.composer.attachment.picker
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import io.getstream.chat.android.models.PollConfig
+import io.getstream.chat.android.models.PollOption
 import io.getstream.chat.android.models.VotingVisibility
 import io.getstream.chat.android.ui.R
 import io.getstream.chat.android.ui.common.utils.PollsConstants
@@ -98,7 +99,7 @@ public class CreatePollViewModel : ViewModel() {
             ) { title, options, allowMultipleVotes, maxAnswers ->
                 PollConfig(
                     name = title,
-                    options = options.map(PollAnswer::text),
+                    options = options.map { PollOption(it.text) },
                     votingVisibility = if (annonymousPoll) VotingVisibility.ANONYMOUS else VotingVisibility.PUBLIC,
                     allowUserSuggestedOptions = suggestAnOption,
                     maxVotesAllowed = maxAnswers.takeIf { allowMultipleVotes } ?: 1,