diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7766d5..1e09ab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 #### v2.0.2
 
-- Based on librdkafka v1.6.1
-
+- Upgrade to librdkafka v1.6.1
+- Add more supported configs from librdkafka.
 
 #### v2.0.1
 
diff --git a/include/erlkaf.hrl b/include/erlkaf.hrl
index 7ef013a..eee87dc 100644
--- a/include/erlkaf.hrl
+++ b/include/erlkaf.hrl
@@ -23,14 +23,15 @@
     {request_required_acks, integer()} |
     {request_timeout_ms, integer()} |
     {message_timeout_ms, integer()} |
+    {partitioner, partitioner()} |
     {compression_codec, compression_codec()} |
     {compression_level, integer()} |
     {auto_commit_interval_ms, integer()} |
     {auto_offset_reset, offset_reset()} |
-    {partitioner, partitioner()} |
     {offset_store_path, binary()} |
-    {offset_store_sync_interval_ms, integer()}|
-    {consume_callback_max_messages, non_neg_integer()}.
+    {offset_store_sync_interval_ms, integer()} |
+    {consume_callback_max_messages, non_neg_integer()} |
+    {dispatch_mode, one_by_one | {batch, non_neg_integer()}}.
 
 -type client_option() ::
     {builtin_features, binary()} |
@@ -47,6 +48,7 @@
     {topic_metadata_refresh_sparse, boolean()} |
     {topic_metadata_propagation_max_ms, non_neg_integer()} |
     {topic_blacklist, binary()} |
+    {debug, binary()} |
     {socket_timeout_ms, integer()} |
     {socket_send_buffer_bytes, integer()} |
     {socket_receive_buffer_bytes, integer()} |
@@ -59,6 +61,7 @@
     {reconnect_backoff_max_ms, integer()} |
     {statistics_interval_ms, integer()} |
     {enabled_events, non_neg_integer()} |
+    {stats_callback, any()} |
     {log_level, integer()} |
     {log_queue, boolean()} |
     {log_thread_name, binary()} |
@@ -93,9 +96,10 @@
     {sasl_password, binary()} |
     {sasl_oauthbearer_config, binary()} |
     {enable_sasl_oauthbearer_unsecure_jwt, boolean()} |
+    {plugin_library_paths, binary()} |
     {group_instance_id, binary()} |
-    {session_timeout_ms, integer()} |
     {partition_assignment_strategy, partition_assignment_strategy()} |
+    {session_timeout_ms, integer()} |
     {heartbeat_interval_ms, integer()} |
     {group_protocol_type, binary()} |
     {coordinator_query_interval_ms, integer()} |
@@ -108,26 +112,26 @@
     {fetch_max_bytes, integer()} |
     {fetch_min_bytes, integer()} |
     {fetch_error_backoff_ms, integer()} |
+    {isolation_level, binary()} |
+    {check_crcs, boolean()} |
     {allow_auto_create_topics, boolean()} |
     {client_rack, binary()} |
     {transactional_id, binary()} |
     {transaction_timeout_ms, non_neg_integer()} |
-    {isolation_level, binary()} |
-    {check_crcs, boolean()} |
     {enable_idempotence, boolean()} |
     {enable_gapless_guarantee, boolean()} |
     {queue_buffering_max_messages, integer()} |
     {queue_buffering_max_kbytes, integer()} |
     {queue_buffering_max_ms, integer()} |
-    {queue_buffering_overflow_strategy, overflow_strategy()} |
     {message_send_max_retries, integer()} |
     {retry_backoff_ms, integer()} |
     {queue_buffering_backpressure_threshold, non_neg_integer()} |
+    {queue_buffering_overflow_strategy, overflow_strategy()} |
     {compression_codec, compression_codec()} |
     {batch_num_messages, integer()} |
     {batch_size, non_neg_integer()} |
     {delivery_report_only_error, boolean()} |
-    {plugin_library_paths, binary()} |
+    {delivery_report_callback, any()} |
     {sticky_partitioning_linger_ms, non_neg_integer()}.
 
 % records