diff --git a/pyrogram/client/types/messages_and_media/message.py b/pyrogram/client/types/messages_and_media/message.py
index e8e587d1..36c35837 100644
--- a/pyrogram/client/types/messages_and_media/message.py
+++ b/pyrogram/client/types/messages_and_media/message.py
@@ -15,9 +15,14 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
+
 from pyrogram.api import types
 from pyrogram.api.core import Object
+from pyrogram.api.errors import MessageIdsEmpty
 from ..bots import InlineKeyboardMarkup, ReplyKeyboardMarkup
+from ..messages_and_media.photo import Photo
+from ..user_and_chats.chat import Chat
+from ..user_and_chats.user import User
 
 
 class Message(Object):
@@ -228,53 +233,54 @@ class Message(Object):
                  group_chat_created: bool = None, supergroup_chat_created: bool = None,
                  channel_chat_created: bool = None, migrate_to_chat_id: int = None, migrate_from_chat_id: int = None,
                  pinned_message=None, views: int = None, via_bot=None, outgoing: bool = None, matches: list = None,
-                 command: list = None, reply_markup=None, client=None, raw=None):
-        self.message_id = message_id  # int
-        self.date = date  # int
-        self.chat = chat  # Chat
-        self.from_user = from_user  # flags.0?User
-        self.forward_from = forward_from  # flags.1?User
-        self.forward_from_chat = forward_from_chat  # flags.2?Chat
-        self.forward_from_message_id = forward_from_message_id  # flags.3?int
-        self.forward_signature = forward_signature  # flags.4?string
-        self.forward_date = forward_date  # flags.5?int
-        self.reply_to_message = reply_to_message  # flags.6?Message
+                 command: list = None, reply_markup=None,
+                 client=None, raw=None):
+        self.message_id = message_id
+        self.date = date
+        self.chat = chat
+        self.from_user = from_user
+        self.forward_from = forward_from
+        self.forward_from_chat = forward_from_chat
+        self.forward_from_message_id = forward_from_message_id
+        self.forward_signature = forward_signature
+        self.forward_date = forward_date
+        self.reply_to_message = reply_to_message
         self.mentioned = mentioned
         self.empty = empty
         self.service = service
         self.media = media
-        self.edit_date = edit_date  # flags.7?int
-        self.media_group_id = media_group_id  # flags.8?string
-        self.author_signature = author_signature  # flags.9?string
-        self.text = text  # flags.10?string
-        self.entities = entities  # flags.11?Vector<MessageEntity>
-        self.caption_entities = caption_entities  # flags.12?Vector<MessageEntity>
-        self.audio = audio  # flags.13?Audio
-        self.document = document  # flags.14?Document
-        self.photo = photo  # flags.16?Vector<PhotoSize>
-        self.sticker = sticker  # flags.17?Sticker
+        self.edit_date = edit_date
+        self.media_group_id = media_group_id
+        self.author_signature = author_signature
+        self.text = text
+        self.entities = entities
+        self.caption_entities = caption_entities
+        self.audio = audio
+        self.document = document
+        self.photo = photo
+        self.sticker = sticker
         self.animation = animation
-        self.video = video  # flags.18?Video
-        self.voice = voice  # flags.19?Voice
-        self.video_note = video_note  # flags.20?VideoNote
-        self.caption = caption  # flags.21?string
-        self.contact = contact  # flags.22?Contact
-        self.location = location  # flags.23?Location
-        self.venue = venue  # flags.24?Venue
+        self.video = video
+        self.voice = voice
+        self.video_note = video_note
+        self.caption = caption
+        self.contact = contact
+        self.location = location
+        self.venue = venue
         self.web_page = web_page
-        self.new_chat_members = new_chat_members  # flags.25?Vector<User>
-        self.left_chat_member = left_chat_member  # flags.26?User
-        self.new_chat_title = new_chat_title  # flags.27?string
-        self.new_chat_photo = new_chat_photo  # flags.28?Vector<PhotoSize>
-        self.delete_chat_photo = delete_chat_photo  # flags.29?true
-        self.group_chat_created = group_chat_created  # flags.30?true
-        self.supergroup_chat_created = supergroup_chat_created  # flags.31?true
-        self.channel_chat_created = channel_chat_created  # flags.32?true
-        self.migrate_to_chat_id = migrate_to_chat_id  # flags.33?int
-        self.migrate_from_chat_id = migrate_from_chat_id  # flags.34?int
-        self.pinned_message = pinned_message  # flags.35?Message
-        self.views = views  # flags.39?int
-        self.via_bot = via_bot  # flags.40?User
+        self.new_chat_members = new_chat_members
+        self.left_chat_member = left_chat_member
+        self.new_chat_title = new_chat_title
+        self.new_chat_photo = new_chat_photo
+        self.delete_chat_photo = delete_chat_photo
+        self.group_chat_created = group_chat_created
+        self.supergroup_chat_created = supergroup_chat_created
+        self.channel_chat_created = channel_chat_created
+        self.migrate_to_chat_id = migrate_to_chat_id
+        self.migrate_from_chat_id = migrate_from_chat_id
+        self.pinned_message = pinned_message
+        self.views = views
+        self.via_bot = via_bot
         self.outgoing = outgoing
         self.matches = matches
         self.command = command