diff --git a/docs/source/pyrogram/types/index.rst b/docs/source/pyrogram/types/index.rst
index ff3de94e..d93ecceb 100644
--- a/docs/source/pyrogram/types/index.rst
+++ b/docs/source/pyrogram/types/index.rst
@@ -1,16 +1,34 @@
-:tocdepth: 1
-
 Types
 =====
 
-.. toctree::
+.. currentmodule:: pyrogram
+
+Users & Chats
+-------------
+
+.. autosummary::
+    :nosignatures:
+
     User
     Chat
+    ChatPhoto
+    ChatMember
+    ChatMembers
+    Dialog
+    Dialogs
+
+Messages & Media
+----------------
+
+.. autosummary::
+    :nosignatures:
+
     Message
-    MessageEntity
     Messages
+    MessageEntity
     Photo
     PhotoSize
+    UserProfilePhotos
     Audio
     Document
     GIF
@@ -20,17 +38,139 @@ Types
     Contact
     Location
     Venue
-    UserProfilePhotos
-    ChatPhoto
-    ChatMember
+    Sticker
+
+Bots
+----
+
+.. autosummary::
+    :nosignatures:
+
+    ReplyKeyboardMarkup
+    KeyboardButton
+    ReplyKeyboardRemove
+    InlineKeyboardMarkup
+    InlineKeyboardButton
+    ForceReply
+    CallbackQuery
+
+Input Media
+-----------
+
+.. autosummary::
+    :nosignatures:
+
     InputMediaPhoto
     InputMediaVideo
     InputPhoneContact
-    Sticker
-    reply_markup/ForceReply
-    reply_markup/InlineKeyboardButton
-    reply_markup/InlineKeyboardMarkup
-    reply_markup/KeyboardButton
-    reply_markup/ReplyKeyboardMarkup
-    reply_markup/ReplyKeyboardRemove
-    CallbackQuery
\ No newline at end of file
+
+..  User & Chats
+    ------------
+
+.. autoclass:: User
+    :members:
+
+.. autoclass:: Chat
+    :members:
+
+.. autoclass:: ChatPhoto
+    :members:
+
+.. autoclass:: ChatMember
+    :members:
+
+.. autoclass:: ChatMembers
+    :members:
+
+.. autoclass:: Dialog
+    :members:
+
+.. autoclass:: Dialogs
+    :members:
+
+..  Messages & Media
+    ----------------
+
+.. autoclass:: Message
+    :members:
+
+.. autoclass:: Messages
+    :members:
+
+.. autoclass:: MessageEntity
+    :members:
+
+.. autoclass:: Photo
+    :members:
+
+.. autoclass:: PhotoSize
+    :members:
+
+.. autoclass:: UserProfilePhotos
+    :members:
+
+.. autoclass:: Audio
+    :members:
+
+.. autoclass:: Document
+    :members:
+
+.. autoclass:: GIF
+    :members:
+
+.. autoclass:: Video
+    :members:
+
+.. autoclass:: Voice
+    :members:
+
+.. autoclass:: VideoNote
+    :members:
+
+.. autoclass:: Contact
+    :members:
+
+.. autoclass:: Location
+    :members:
+
+.. autoclass:: Venue
+    :members:
+
+.. autoclass:: Sticker
+    :members:
+
+..  Bots
+    ----
+
+.. autoclass:: ReplyKeyboardMarkup
+    :members:
+
+.. autoclass:: KeyboardButton
+    :members:
+
+.. autoclass:: ReplyKeyboardRemove
+    :members:
+
+.. autoclass:: InlineKeyboardMarkup
+    :members:
+
+.. autoclass:: InlineKeyboardButton
+    :members:
+
+.. autoclass:: ForceReply
+    :members:
+
+.. autoclass:: CallbackQuery
+    :members:
+
+..  Input Media
+    -----------
+
+.. autoclass:: InputMediaPhoto
+    :members:
+
+.. autoclass:: InputMediaVideo
+    :members:
+
+.. autoclass:: InputPhoneContact
+    :members: