diff --git a/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py b/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py
index 33ffbcb98..e3750a68d 100644
--- a/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py
+++ b/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py
@@ -90,6 +90,7 @@ generate({
     'bytes': 'string',
   },
   'builtinInclude': 'mtproto/core_types.h',
+  'optimizeSingleData': True,
 
   'dumpToText': {
     'include': 'mtproto/details/mtproto_dump_to_text.h',
diff --git a/Telegram/SourceFiles/mtproto/core_types.h b/Telegram/SourceFiles/mtproto/core_types.h
index 4cbd6fd88..05aafa69a 100644
--- a/Telegram/SourceFiles/mtproto/core_types.h
+++ b/Telegram/SourceFiles/mtproto/core_types.h
@@ -29,6 +29,9 @@ using mtpPingId = uint64;
 using mtpBuffer = QVector<mtpPrime>;
 using mtpTypeId = uint32;
 
+struct NotSingleDataTypePlaceholder {
+};
+
 namespace MTP {
 
 // type DcId represents actual data center id, while in most cases