diff --git a/DXFeedFramework.xcodeproj/project.pbxproj b/DXFeedFramework.xcodeproj/project.pbxproj
index 4e193d76d..79c62099e 100644
--- a/DXFeedFramework.xcodeproj/project.pbxproj
+++ b/DXFeedFramework.xcodeproj/project.pbxproj
@@ -190,6 +190,23 @@
 		647426AF2ABC93900012F793 /* EventCode+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647426AE2ABC93900012F793 /* EventCode+String.swift */; };
 		6479BC2B2A4F35A300A3D404 /* QuoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6479BC2A2A4F35A300A3D404 /* QuoteView.swift */; };
 		6486B97F2AD4167800D8D5FA /* LiveIpfCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B97E2AD4167800D8D5FA /* LiveIpfCommand.swift */; };
+		6486B9582AD00BDC00D8D5FA /* Summary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9572AD00BDC00D8D5FA /* Summary.swift */; };
+		6486B95B2AD015B400D8D5FA /* PriceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B95A2AD015B400D8D5FA /* PriceType.swift */; };
+		6486B95D2AD0287E00D8D5FA /* DateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B95C2AD0287E00D8D5FA /* DateTests.swift */; };
+		6486B95F2AD02C0C00D8D5FA /* Summary+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B95E2AD02C0C00D8D5FA /* Summary+Ext.swift */; };
+		6486B9612AD02D3900D8D5FA /* SummaryMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9602AD02D3900D8D5FA /* SummaryMapper.swift */; };
+		6486B9632AD0333B00D8D5FA /* Greeks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9622AD0333B00D8D5FA /* Greeks.swift */; };
+		6486B9652AD038FC00D8D5FA /* Greeks+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9642AD038FC00D8D5FA /* Greeks+Ext.swift */; };
+		6486B9672AD0390800D8D5FA /* GreeksMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9662AD0390800D8D5FA /* GreeksMapper.swift */; };
+		6486B96B2AD03DC900D8D5FA /* Underlying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B96A2AD03DC900D8D5FA /* Underlying.swift */; };
+		6486B96F2AD0445400D8D5FA /* Underlying+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B96E2AD0445400D8D5FA /* Underlying+Ext.swift */; };
+		6486B9712AD0445E00D8D5FA /* UnderlyingMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9702AD0445E00D8D5FA /* UnderlyingMapper.swift */; };
+		6486B9732AD045C800D8D5FA /* TheoPrice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9722AD045C800D8D5FA /* TheoPrice.swift */; };
+		6486B9752AD0493F00D8D5FA /* TheoPrice+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9742AD0493F00D8D5FA /* TheoPrice+Ext.swift */; };
+		6486B9772AD04C5800D8D5FA /* TheoPriceMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9762AD04C5800D8D5FA /* TheoPriceMapper.swift */; };
+		6486B9792AD04F4000D8D5FA /* OrderBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9782AD04F4000D8D5FA /* OrderBase.swift */; };
+		6486B97B2AD0517A00D8D5FA /* OrderAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B97A2AD0517A00D8D5FA /* OrderAction.swift */; };
+		6486B97D2AD057F200D8D5FA /* OrderSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B97C2AD057F200D8D5FA /* OrderSource.swift */; };
 		648BD5692AC450D6004A3A95 /* ConnectCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648BD5682AC450D6004A3A95 /* ConnectCommand.swift */; };
 		648BD56B2AC4576F004A3A95 /* HelpCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648BD56A2AC4576F004A3A95 /* HelpCommand.swift */; };
 		648BD56D2AC56A04004A3A95 /* SubscriptionUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648BD56C2AC56A04004A3A95 /* SubscriptionUtils.swift */; };
@@ -199,7 +216,10 @@
 		649282E72AD54919008F0F04 /* ScheduleUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649282E62AD54919008F0F04 /* ScheduleUtils.swift */; };
 		649282E82AD54919008F0F04 /* ScheduleUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649282E62AD54919008F0F04 /* ScheduleUtils.swift */; };
 		649282EB2AD55323008F0F04 /* IpfConnectCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649282E92AD55323008F0F04 /* IpfConnectCommand.swift */; };
+		649282ED2AD593F3008F0F04 /* OrderSourceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649282EC2AD593F3008F0F04 /* OrderSourceTest.swift */; };
 		64963B6A2A8E545C001E40F7 /* IEventType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64963B692A8E545C001E40F7 /* IEventType.swift */; };
+		649706842AD82B070068FF88 /* Series.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649706832AD82B070068FF88 /* Series.swift */; };
+		649706862AD832860068FF88 /* Series+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649706852AD832860068FF88 /* Series+Ext.swift */; };
 		6498E6B22AB1D41A0093A065 /* DXSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6498E6B12AB1D41A0093A065 /* DXSchedule.swift */; };
 		6498E6B52AB1D4480093A065 /* NativeSchedule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6498E6B42AB1D4480093A065 /* NativeSchedule.swift */; };
 		6498E6B72AB1DACE0093A065 /* ScheduleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6498E6B62AB1DACE0093A065 /* ScheduleTest.swift */; };
@@ -212,6 +232,9 @@
 		64AAF0552A82499A00E8942B /* ConcurrentDict.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AAF0542A82499A00E8942B /* ConcurrentDict.swift */; };
 		64AAF0572A82A3FC00E8942B /* ICandleSymbolProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AAF0562A82A3FC00E8942B /* ICandleSymbolProperty.swift */; };
 		64AAF0592A83EA0000E8942B /* Double+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AAF0582A83EA0000E8942B /* Double+Ext.swift */; };
+		64ABC0FF2AD91E6500904D78 /* OptionSale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ABC0FE2AD91E6500904D78 /* OptionSale.swift */; };
+		64ABC1012AD9284900904D78 /* OptionSale+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ABC1002AD9284900904D78 /* OptionSale+Ext.swift */; };
+		64ABC1032AD9294D00904D78 /* OptionSaleMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ABC1022AD9294C00904D78 /* OptionSaleMapper.swift */; };
 		64ACBCCF2A27851C00032C53 /* FeedTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64104FC02A210DDD00D1FC41 /* FeedTest.swift */; };
 		64ACBCD52A2789EF00032C53 /* TestListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641BCBB92A1FB42500FE23C2 /* TestListener.swift */; };
 		64ACBCD72A27981900032C53 /* ListNative+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ACBCD62A27981900032C53 /* ListNative+Ext.swift */; };
@@ -262,6 +285,17 @@
 		64BA92672A306E3100BE26A0 /* Trade+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BA92662A306E3100BE26A0 /* Trade+Ext.swift */; };
 		64BA92692A306E6000BE26A0 /* TradeBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BA92682A306E6000BE26A0 /* TradeBase.swift */; };
 		64BA926B2A3072CA00BE26A0 /* TradeMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BA926A2A3072CA00BE26A0 /* TradeMapper.swift */; };
+		64BDDB1E2AD6CC6A00694210 /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB1D2AD6CC6A00694210 /* Order.swift */; };
+		64BDDB202AD6CC8300694210 /* AnalyticOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB1F2AD6CC8300694210 /* AnalyticOrder.swift */; };
+		64BDDB222AD6CC9A00694210 /* SpreadOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB212AD6CC9A00694210 /* SpreadOrder.swift */; };
+		64BDDB242AD6F10200694210 /* Scope.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB232AD6F10200694210 /* Scope.swift */; };
+		64BDDB262AD6F6B500694210 /* IcebergType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB252AD6F6B500694210 /* IcebergType.swift */; };
+		64BDDB282AD7D8D300694210 /* Order+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB272AD7D8D300694210 /* Order+Ext.swift */; };
+		64BDDB2A2AD7D9C700694210 /* SpreadOrder+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB292AD7D9C700694210 /* SpreadOrder+Ext.swift */; };
+		64BDDB2C2AD7DB9B00694210 /* AnalyticOrder+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB2B2AD7DB9B00694210 /* AnalyticOrder+Ext.swift */; };
+		64BDDB2E2AD7DC5E00694210 /* OrderMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB2D2AD7DC5E00694210 /* OrderMapper.swift */; };
+		64BDDB312AD7E5A600694210 /* AnalyticOrderMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB2F2AD7E5A500694210 /* AnalyticOrderMapper.swift */; };
+		64BDDB322AD7E5A600694210 /* SpreadOrderMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BDDB302AD7E5A600694210 /* SpreadOrderMapper.swift */; };
 		64C771F22A94A224009868C2 /* Character+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C771F12A94A224009868C2 /* Character+Ext.swift */; };
 		64C771F42A94A86E009868C2 /* Side.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C771F32A94A86E009868C2 /* Side.swift */; };
 		64C771F62A94ADDA009868C2 /* Direction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C771F52A94ADDA009868C2 /* Direction.swift */; };
@@ -287,6 +321,7 @@
 		64DB79352A376E1B00229597 /* DXFeedFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 803BAC0D29BFA50700FFAB1C /* DXFeedFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		64E342502AAB083700457994 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6469F8D22A3B401700846831 /* Colors.swift */; };
 		64E342522AAB29CF00457994 /* InstrumentProfileType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E342512AAB29CF00457994 /* InstrumentProfileType.swift */; };
+		64E3637B2AD83459002E2B0D /* SeriesMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E3637A2AD83459002E2B0D /* SeriesMapper.swift */; };
 		64ECD67F2A9CF4CB00B36935 /* IPFTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ECD67E2A9CF4CB00B36935 /* IPFTests.swift */; };
 		64ECD6822A9DDC2800B36935 /* DXInstrumentProfileReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ECD6812A9DDC2800B36935 /* DXInstrumentProfileReader.swift */; };
 		64ECD6852A9DDF6200B36935 /* DXInstrumentProfileCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64ECD6842A9DDF6200B36935 /* DXInstrumentProfileCollector.swift */; };
@@ -614,6 +649,23 @@
 		647426AE2ABC93900012F793 /* EventCode+String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EventCode+String.swift"; sourceTree = "<group>"; };
 		6479BC2A2A4F35A300A3D404 /* QuoteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuoteView.swift; sourceTree = "<group>"; };
 		6486B97E2AD4167800D8D5FA /* LiveIpfCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveIpfCommand.swift; sourceTree = "<group>"; };
+		6486B9572AD00BDC00D8D5FA /* Summary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Summary.swift; sourceTree = "<group>"; };
+		6486B95A2AD015B400D8D5FA /* PriceType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PriceType.swift; sourceTree = "<group>"; };
+		6486B95C2AD0287E00D8D5FA /* DateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTests.swift; sourceTree = "<group>"; };
+		6486B95E2AD02C0C00D8D5FA /* Summary+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Summary+Ext.swift"; sourceTree = "<group>"; };
+		6486B9602AD02D3900D8D5FA /* SummaryMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SummaryMapper.swift; sourceTree = "<group>"; };
+		6486B9622AD0333B00D8D5FA /* Greeks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Greeks.swift; sourceTree = "<group>"; };
+		6486B9642AD038FC00D8D5FA /* Greeks+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Greeks+Ext.swift"; sourceTree = "<group>"; };
+		6486B9662AD0390800D8D5FA /* GreeksMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GreeksMapper.swift; sourceTree = "<group>"; };
+		6486B96A2AD03DC900D8D5FA /* Underlying.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Underlying.swift; sourceTree = "<group>"; };
+		6486B96E2AD0445400D8D5FA /* Underlying+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Underlying+Ext.swift"; sourceTree = "<group>"; };
+		6486B9702AD0445E00D8D5FA /* UnderlyingMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnderlyingMapper.swift; sourceTree = "<group>"; };
+		6486B9722AD045C800D8D5FA /* TheoPrice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TheoPrice.swift; sourceTree = "<group>"; };
+		6486B9742AD0493F00D8D5FA /* TheoPrice+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TheoPrice+Ext.swift"; sourceTree = "<group>"; };
+		6486B9762AD04C5800D8D5FA /* TheoPriceMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TheoPriceMapper.swift; sourceTree = "<group>"; };
+		6486B9782AD04F4000D8D5FA /* OrderBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderBase.swift; sourceTree = "<group>"; };
+		6486B97A2AD0517A00D8D5FA /* OrderAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderAction.swift; sourceTree = "<group>"; };
+		6486B97C2AD057F200D8D5FA /* OrderSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderSource.swift; sourceTree = "<group>"; };
 		648BD5682AC450D6004A3A95 /* ConnectCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectCommand.swift; sourceTree = "<group>"; };
 		648BD56A2AC4576F004A3A95 /* HelpCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpCommand.swift; sourceTree = "<group>"; };
 		648BD56C2AC56A04004A3A95 /* SubscriptionUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionUtils.swift; sourceTree = "<group>"; };
@@ -622,7 +674,10 @@
 		648E98A92AAF625800BFD219 /* IIndexedEvent+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "IIndexedEvent+Ext.swift"; sourceTree = "<group>"; };
 		649282E62AD54919008F0F04 /* ScheduleUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleUtils.swift; sourceTree = "<group>"; };
 		649282E92AD55323008F0F04 /* IpfConnectCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IpfConnectCommand.swift; sourceTree = "<group>"; };
+		649282EC2AD593F3008F0F04 /* OrderSourceTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderSourceTest.swift; sourceTree = "<group>"; };
 		64963B692A8E545C001E40F7 /* IEventType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IEventType.swift; sourceTree = "<group>"; };
+		649706832AD82B070068FF88 /* Series.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Series.swift; sourceTree = "<group>"; };
+		649706852AD832860068FF88 /* Series+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Series+Ext.swift"; sourceTree = "<group>"; };
 		6498E6B12AB1D41A0093A065 /* DXSchedule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXSchedule.swift; sourceTree = "<group>"; };
 		6498E6B42AB1D4480093A065 /* NativeSchedule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeSchedule.swift; sourceTree = "<group>"; };
 		6498E6B62AB1DACE0093A065 /* ScheduleTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleTest.swift; sourceTree = "<group>"; };
@@ -635,6 +690,9 @@
 		64AAF0542A82499A00E8942B /* ConcurrentDict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcurrentDict.swift; sourceTree = "<group>"; };
 		64AAF0562A82A3FC00E8942B /* ICandleSymbolProperty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ICandleSymbolProperty.swift; sourceTree = "<group>"; };
 		64AAF0582A83EA0000E8942B /* Double+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Double+Ext.swift"; sourceTree = "<group>"; };
+		64ABC0FE2AD91E6500904D78 /* OptionSale.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionSale.swift; sourceTree = "<group>"; };
+		64ABC1002AD9284900904D78 /* OptionSale+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OptionSale+Ext.swift"; sourceTree = "<group>"; };
+		64ABC1022AD9294C00904D78 /* OptionSaleMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionSaleMapper.swift; sourceTree = "<group>"; };
 		64ACBCD62A27981900032C53 /* ListNative+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ListNative+Ext.swift"; sourceTree = "<group>"; };
 		64ACBCD82A279F7900032C53 /* DXEventListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXEventListener.swift; sourceTree = "<group>"; };
 		64ACBCDC2A28978600032C53 /* Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Symbol.swift; sourceTree = "<group>"; };
@@ -687,6 +745,17 @@
 		64BA92662A306E3100BE26A0 /* Trade+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Trade+Ext.swift"; sourceTree = "<group>"; };
 		64BA92682A306E6000BE26A0 /* TradeBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TradeBase.swift; sourceTree = "<group>"; };
 		64BA926A2A3072CA00BE26A0 /* TradeMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TradeMapper.swift; sourceTree = "<group>"; };
+		64BDDB1D2AD6CC6A00694210 /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		64BDDB1F2AD6CC8300694210 /* AnalyticOrder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticOrder.swift; sourceTree = "<group>"; };
+		64BDDB212AD6CC9A00694210 /* SpreadOrder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpreadOrder.swift; sourceTree = "<group>"; };
+		64BDDB232AD6F10200694210 /* Scope.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Scope.swift; sourceTree = "<group>"; };
+		64BDDB252AD6F6B500694210 /* IcebergType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IcebergType.swift; sourceTree = "<group>"; };
+		64BDDB272AD7D8D300694210 /* Order+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Order+Ext.swift"; sourceTree = "<group>"; };
+		64BDDB292AD7D9C700694210 /* SpreadOrder+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SpreadOrder+Ext.swift"; sourceTree = "<group>"; };
+		64BDDB2B2AD7DB9B00694210 /* AnalyticOrder+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AnalyticOrder+Ext.swift"; sourceTree = "<group>"; };
+		64BDDB2D2AD7DC5E00694210 /* OrderMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderMapper.swift; sourceTree = "<group>"; };
+		64BDDB2F2AD7E5A500694210 /* AnalyticOrderMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalyticOrderMapper.swift; sourceTree = "<group>"; };
+		64BDDB302AD7E5A600694210 /* SpreadOrderMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpreadOrderMapper.swift; sourceTree = "<group>"; };
 		64C771F12A94A224009868C2 /* Character+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Character+Ext.swift"; sourceTree = "<group>"; };
 		64C771F32A94A86E009868C2 /* Side.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Side.swift; sourceTree = "<group>"; };
 		64C771F52A94ADDA009868C2 /* Direction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Direction.swift; sourceTree = "<group>"; };
@@ -710,6 +779,7 @@
 		64DA26BD2AA20EDB005B1757 /* DXInstrumentProfileConnectionObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXInstrumentProfileConnectionObserver.swift; sourceTree = "<group>"; };
 		64DA26BF2AA224EB005B1757 /* NativeIPFConnectionListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeIPFConnectionListener.swift; sourceTree = "<group>"; };
 		64E342512AAB29CF00457994 /* InstrumentProfileType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstrumentProfileType.swift; sourceTree = "<group>"; };
+		64E3637A2AD83459002E2B0D /* SeriesMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeriesMapper.swift; sourceTree = "<group>"; };
 		64ECD67E2A9CF4CB00B36935 /* IPFTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPFTests.swift; sourceTree = "<group>"; };
 		64ECD6812A9DDC2800B36935 /* DXInstrumentProfileReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXInstrumentProfileReader.swift; sourceTree = "<group>"; };
 		64ECD6842A9DDF6200B36935 /* DXInstrumentProfileCollector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXInstrumentProfileCollector.swift; sourceTree = "<group>"; };
@@ -872,25 +942,23 @@
 		641BCBBF2A21051A00FE23C2 /* Market */ = {
 			isa = PBXGroup;
 			children = (
+				6486B9592AD00E0B00D8D5FA /* Extra */,
 				649F48842A615BA90016FDD1 /* Candles */,
 				6469F8BE2A3B163E00846831 /* Extensions */,
-				64963B692A8E545C001E40F7 /* IEventType.swift */,
-				6447A5DA2A8E559000739CCF /* ILastingEvent.swift */,
-				6447A5DE2A8E56FC00739CCF /* IIndexedEvent.swift */,
-				6447A5DC2A8E56CF00739CCF /* ITimeSeriesEvent.swift */,
 				64BA92642A306E0200BE26A0 /* Trade.swift */,
 				641A59992AB4794E003899FB /* TradeETH.swift */,
-				642BE4C92A2E1C640052340A /* MarketEvent.swift */,
 				642BE4C32A2E1AFF0052340A /* Quote.swift */,
 				642BE4D12A2F5D230052340A /* TimeAndSale.swift */,
 				64BA925E2A306B9600BE26A0 /* Profile.swift */,
-				64BA92682A306E6000BE26A0 /* TradeBase.swift */,
-				6447A5E02A8E5A5400739CCF /* IndexedEventSource.swift */,
-				64C771F32A94A86E009868C2 /* Side.swift */,
-				64C771F52A94ADDA009868C2 /* Direction.swift */,
-				64C771F72A94B88C009868C2 /* TimeAndSaleType.swift */,
-				64C771F92A94D692009868C2 /* ShortSaleRestriction.swift */,
-				64C771FB2A94D7E9009868C2 /* TradingStatus.swift */,
+				6486B9572AD00BDC00D8D5FA /* Summary.swift */,
+				6486B9622AD0333B00D8D5FA /* Greeks.swift */,
+				6486B96A2AD03DC900D8D5FA /* Underlying.swift */,
+				6486B9722AD045C800D8D5FA /* TheoPrice.swift */,
+				64BDDB1D2AD6CC6A00694210 /* Order.swift */,
+				64BDDB1F2AD6CC8300694210 /* AnalyticOrder.swift */,
+				64BDDB212AD6CC9A00694210 /* SpreadOrder.swift */,
+				649706832AD82B070068FF88 /* Series.swift */,
+				64ABC0FE2AD91E6500904D78 /* OptionSale.swift */,
 			);
 			path = Market;
 			sourceTree = "<group>";
@@ -949,6 +1017,24 @@
 				64BA926A2A3072CA00BE26A0 /* TradeMapper.swift */,
 				64278C6F2A602FA00074B5AA /* Candle+Ext.swift */,
 				64278C712A6030290074B5AA /* CandleMapper.swift */,
+				6486B95E2AD02C0C00D8D5FA /* Summary+Ext.swift */,
+				6486B9602AD02D3900D8D5FA /* SummaryMapper.swift */,
+				6486B9642AD038FC00D8D5FA /* Greeks+Ext.swift */,
+				6486B9662AD0390800D8D5FA /* GreeksMapper.swift */,
+				6486B96E2AD0445400D8D5FA /* Underlying+Ext.swift */,
+				6486B9702AD0445E00D8D5FA /* UnderlyingMapper.swift */,
+				6486B9742AD0493F00D8D5FA /* TheoPrice+Ext.swift */,
+				6486B9762AD04C5800D8D5FA /* TheoPriceMapper.swift */,
+				64BDDB272AD7D8D300694210 /* Order+Ext.swift */,
+				64BDDB2D2AD7DC5E00694210 /* OrderMapper.swift */,
+				64BDDB292AD7D9C700694210 /* SpreadOrder+Ext.swift */,
+				64BDDB302AD7E5A600694210 /* SpreadOrderMapper.swift */,
+				64BDDB2B2AD7DB9B00694210 /* AnalyticOrder+Ext.swift */,
+				64BDDB2F2AD7E5A500694210 /* AnalyticOrderMapper.swift */,
+				649706852AD832860068FF88 /* Series+Ext.swift */,
+				64E3637A2AD83459002E2B0D /* SeriesMapper.swift */,
+				64ABC1002AD9284900904D78 /* OptionSale+Ext.swift */,
+				64ABC1022AD9294C00904D78 /* OptionSaleMapper.swift */,
 			);
 			path = Markets;
 			sourceTree = "<group>";
@@ -1078,6 +1164,31 @@
 			path = Utils;
 			sourceTree = "<group>";
 		};
+		6486B9592AD00E0B00D8D5FA /* Extra */ = {
+			isa = PBXGroup;
+			children = (
+				64963B692A8E545C001E40F7 /* IEventType.swift */,
+				6447A5DA2A8E559000739CCF /* ILastingEvent.swift */,
+				6447A5DE2A8E56FC00739CCF /* IIndexedEvent.swift */,
+				6447A5DC2A8E56CF00739CCF /* ITimeSeriesEvent.swift */,
+				642BE4C92A2E1C640052340A /* MarketEvent.swift */,
+				64BA92682A306E6000BE26A0 /* TradeBase.swift */,
+				6447A5E02A8E5A5400739CCF /* IndexedEventSource.swift */,
+				64C771F32A94A86E009868C2 /* Side.swift */,
+				64C771F52A94ADDA009868C2 /* Direction.swift */,
+				64C771F72A94B88C009868C2 /* TimeAndSaleType.swift */,
+				64C771F92A94D692009868C2 /* ShortSaleRestriction.swift */,
+				64C771FB2A94D7E9009868C2 /* TradingStatus.swift */,
+				6486B95A2AD015B400D8D5FA /* PriceType.swift */,
+				6486B9782AD04F4000D8D5FA /* OrderBase.swift */,
+				6486B97A2AD0517A00D8D5FA /* OrderAction.swift */,
+				6486B97C2AD057F200D8D5FA /* OrderSource.swift */,
+				64BDDB232AD6F10200694210 /* Scope.swift */,
+				64BDDB252AD6F6B500694210 /* IcebergType.swift */,
+			);
+			path = Extra;
+			sourceTree = "<group>";
+		};
 		6498E6B02AB1D40C0093A065 /* Schedule */ = {
 			isa = PBXGroup;
 			children = (
@@ -1327,6 +1438,8 @@
 				6498E6B62AB1DACE0093A065 /* ScheduleTest.swift */,
 				648BD56E2AC582AB004A3A95 /* DateTimeParserTest.swift */,
 				64098F662ACEB6F70020D741 /* DXConnectionStateTests.swift */,
+				6486B95C2AD0287E00D8D5FA /* DateTests.swift */,
+				649282EC2AD593F3008F0F04 /* OrderSourceTest.swift */,
 			);
 			path = DXFeedFrameworkTests;
 			sourceTree = "<group>";
@@ -2001,9 +2114,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				64BDDB322AD7E5A600694210 /* SpreadOrderMapper.swift in Sources */,
 				64ACBCE32A289A0700032C53 /* TimeSeriesSubscriptionSymbol.swift in Sources */,
 				645A34952A937C7200709F29 /* BinaryInteger+Ext.swift in Sources */,
 				64BA92652A306E0200BE26A0 /* Trade.swift in Sources */,
+				6486B9752AD0493F00D8D5FA /* TheoPrice+Ext.swift in Sources */,
 				6464074B2A9DFAF7006FF769 /* InstrumentProfile+Ext.swift in Sources */,
 				64C771F22A94A224009868C2 /* Character+Ext.swift in Sources */,
 				8088D77129C3A25D00F240CB /* SystemProperty.swift in Sources */,
@@ -2013,11 +2128,14 @@
 				6469F8C22A3B169A00846831 /* MathUtil.swift in Sources */,
 				80FC415929C8EE8B00E6B611 /* DXEndpoint.swift in Sources */,
 				64C771F62A94ADDA009868C2 /* Direction.swift in Sources */,
+				64BDDB312AD7E5A600694210 /* AnalyticOrderMapper.swift in Sources */,
 				640C3FDC2A618B2000555161 /* MarketEventSymbols.swift in Sources */,
 				642BE4D42A2F5D730052340A /* TimeAndSale+Ext.swift in Sources */,
 				64ACBCD92A279F7900032C53 /* DXEventListener.swift in Sources */,
 				64ECD6852A9DDF6200B36935 /* DXInstrumentProfileCollector.swift in Sources */,
+				6486B96F2AD0445400D8D5FA /* Underlying+Ext.swift in Sources */,
 				64656F5B2A1B9784006A0B19 /* DXFeed.swift in Sources */,
+				6486B96B2AD03DC900D8D5FA /* Underlying.swift in Sources */,
 				6447A5EF2A8FD1CD00739CCF /* DayUtil.swift in Sources */,
 				64B436462AB985AE0003919E /* NativeBox.swift in Sources */,
 				6447A5E92A8F9E0B00739CCF /* TimeNanosUtil.swift in Sources */,
@@ -2029,16 +2147,22 @@
 				64278C6E2A602D2B0074B5AA /* Candle.swift in Sources */,
 				64ACBCE62A28BA7D00032C53 /* SymbolMapper.swift in Sources */,
 				64ECD6822A9DDC2800B36935 /* DXInstrumentProfileReader.swift in Sources */,
+				6486B9712AD0445E00D8D5FA /* UnderlyingMapper.swift in Sources */,
+				64E3637B2AD83459002E2B0D /* SeriesMapper.swift in Sources */,
 				642BE4CC2A2E1DB70052340A /* Mapper.swift in Sources */,
 				64104FC72A2613BC00D1FC41 /* ConcurrentArray.swift in Sources */,
 				6498E6B22AB1D41A0093A065 /* DXSchedule.swift in Sources */,
+				64BDDB2C2AD7DB9B00694210 /* AnalyticOrder+Ext.swift in Sources */,
 				646407572AA0C44D006FF769 /* NativeInstrumentProfileCollector.swift in Sources */,
+				6486B9732AD045C800D8D5FA /* TheoPrice.swift in Sources */,
 				64ACBCDF2A2897EA00032C53 /* String+Symbol.swift in Sources */,
 				64B4363A2AB86D1A0003919E /* DayFilter.swift in Sources */,
 				64ECD6872A9DDFBE00B36935 /* DXInstrumentProfileConnection.swift in Sources */,
+				6486B9772AD04C5800D8D5FA /* TheoPriceMapper.swift in Sources */,
 				64278C702A602FA00074B5AA /* Candle+Ext.swift in Sources */,
 				64B4363C2AB86F3C0003919E /* DayFilter+Ext.swift in Sources */,
 				6464075B2AA0CEF2006FF769 /* NativeExecutor.swift in Sources */,
+				6486B97B2AD0517A00D8D5FA /* OrderAction.swift in Sources */,
 				64DA26B82AA20095005B1757 /* NativeInstrumentProfileConnection.swift in Sources */,
 				64104FC32A210F2400D1FC41 /* EventCode+Native.swift in Sources */,
 				80FC415C29CA2B8800E6B611 /* NativeBuilder.swift in Sources */,
@@ -2051,25 +2175,35 @@
 				6447A5DB2A8E559000739CCF /* ILastingEvent.swift in Sources */,
 				64ACBCDD2A28978600032C53 /* Symbol.swift in Sources */,
 				64B4363E2AB883350003919E /* SessionFilter.swift in Sources */,
+				6486B9612AD02D3900D8D5FA /* SummaryMapper.swift in Sources */,
 				64B436402AB8857F0003919E /* SessionFilter+Ext.swift in Sources */,
 				646407592AA0CA8D006FF769 /* NativeProfileIterator.swift in Sources */,
 				6469F8C82A3B25C900846831 /* MarketEvent+Access.swift in Sources */,
 				640C3FD22A6178D200555161 /* CandleSession.swift in Sources */,
 				6498E6BD2AB1E0510093A065 /* ScheduleSession.swift in Sources */,
+				64BDDB262AD6F6B500694210 /* IcebergType.swift in Sources */,
 				8088D76529C0FBCE00F240CB /* ThreadManager.swift in Sources */,
 				64DA26BE2AA20EDB005B1757 /* DXInstrumentProfileConnectionObserver.swift in Sources */,
 				64656F732A1D0A84006A0B19 /* EndpointListener.swift in Sources */,
+				64BDDB282AD7D8D300694210 /* Order+Ext.swift in Sources */,
+				6486B9582AD00BDC00D8D5FA /* Summary.swift in Sources */,
 				64104FCC2A2629D800D1FC41 /* NativeSubscription.swift in Sources */,
 				64C772012A975102009868C2 /* Reference+Util.swift in Sources */,
 				64656F6D2A1CFB10006A0B19 /* DXEndpointState.swift in Sources */,
 				6464074D2A9E352E006FF769 /* InstrumentProfileField.swift in Sources */,
+				64ABC0FF2AD91E6500904D78 /* OptionSale.swift in Sources */,
+				64ABC1012AD9284900904D78 /* OptionSale+Ext.swift in Sources */,
+				6486B9632AD0333B00D8D5FA /* Greeks.swift in Sources */,
 				64E342522AAB29CF00457994 /* InstrumentProfileType.swift in Sources */,
 				648E98AA2AAF625800BFD219 /* IIndexedEvent+Ext.swift in Sources */,
 				6447A5E32A8F611700739CCF /* IObservableSubscription.swift in Sources */,
 				64104FC92A26298D00D1FC41 /* DXFeedSubcription.swift in Sources */,
+				64ABC1032AD9294D00904D78 /* OptionSaleMapper.swift in Sources */,
 				64104FD32A277B2D00D1FC41 /* ListNative.swift in Sources */,
+				649706862AD832860068FF88 /* Series+Ext.swift in Sources */,
 				642BE4C82A2E1BD40052340A /* QuoteMapper.swift in Sources */,
 				64AAF0552A82499A00E8942B /* ConcurrentDict.swift in Sources */,
+				6486B95F2AD02C0C00D8D5FA /* Summary+Ext.swift in Sources */,
 				64ACBCE12A28999B00032C53 /* WildcardSymbol.swift in Sources */,
 				64C771F42A94A86E009868C2 /* Side.swift in Sources */,
 				64656F672A1CCFC2006A0B19 /* DXPublisher.swift in Sources */,
@@ -2077,8 +2211,10 @@
 				6447A5F12A8FDD1B00739CCF /* BitUtil.swift in Sources */,
 				64963B6A2A8E545C001E40F7 /* IEventType.swift in Sources */,
 				6428EF282AB0856400F54F59 /* DXInstrumentProfileConnectionState+Ext.swift in Sources */,
+				64BDDB222AD6CC9A00694210 /* SpreadOrder.swift in Sources */,
 				640C3FCE2A61788500555161 /* CandleExchange.swift in Sources */,
 				641BCBBC2A20ED8100FE23C2 /* DXEndpointObserver.swift in Sources */,
+				6486B9792AD04F4000D8D5FA /* OrderBase.swift in Sources */,
 				64656F772A1DFED9006A0B19 /* EndpointState+Native.swift in Sources */,
 				6498E6B52AB1D4480093A065 /* NativeSchedule.swift in Sources */,
 				64DA26BC2AA20B66005B1757 /* InstrumentProfileConnectionState+ext.swift in Sources */,
@@ -2090,9 +2226,12 @@
 				641BCBC12A21077800FE23C2 /* EventCode.swift in Sources */,
 				64ACBCE82A28CF9700032C53 /* IndexedEventSubscriptionSymbol.swift in Sources */,
 				649F48882A615BED0016FDD1 /* CandleType.swift in Sources */,
+				64BDDB2E2AD7DC5E00694210 /* OrderMapper.swift in Sources */,
+				649706842AD82B070068FF88 /* Series.swift in Sources */,
 				6447A5E52A8F736E00739CCF /* TimeUtil.swift in Sources */,
 				64C771FC2A94D7E9009868C2 /* TradingStatus.swift in Sources */,
 				642BE4D22A2F5D230052340A /* TimeAndSale.swift in Sources */,
+				6486B9652AD038FC00D8D5FA /* Greeks+Ext.swift in Sources */,
 				64BA92692A306E6000BE26A0 /* TradeBase.swift in Sources */,
 				640C3FD02A6178B400555161 /* CandlePrice.swift in Sources */,
 				641A599A2AB4794E003899FB /* TradeETH.swift in Sources */,
@@ -2108,6 +2247,7 @@
 				64C771FF2A9504ED009868C2 /* SnapshotProcessor.swift in Sources */,
 				64C771F82A94B88C009868C2 /* TimeAndSaleType.swift in Sources */,
 				641BDD5B2AC72BD400236B78 /* ConcurrentWeakHashTable.swift in Sources */,
+				64BDDB242AD6F10200694210 /* Scope.swift in Sources */,
 				6447A5DF2A8E56FC00739CCF /* IIndexedEvent.swift in Sources */,
 				64104FC52A26059B00D1FC41 /* ConcurrentSet.swift in Sources */,
 				64BA925F2A306B9600BE26A0 /* Profile.swift in Sources */,
@@ -2119,18 +2259,24 @@
 				642BE4C42A2E1AFF0052340A /* Quote.swift in Sources */,
 				64656F602A1B9EC2006A0B19 /* EnumUtil.swift in Sources */,
 				642BE4CA2A2E1C640052340A /* MarketEvent.swift in Sources */,
+				6486B95B2AD015B400D8D5FA /* PriceType.swift in Sources */,
 				8088D76629C0FBCE00F240CB /* IsolateThread.swift in Sources */,
+				64BDDB202AD6CC8300694210 /* AnalyticOrder.swift in Sources */,
 				64AAF0532A8113E800E8942B /* String+Range.swift in Sources */,
 				642BE4D02A2F1D3C0052340A /* Quote+Ext.swift in Sources */,
 				641AC1A92A61AE4000EF6D6C /* DXAliases.swift in Sources */,
 				64BA92632A306BBD00BE26A0 /* ProfileMapper.swift in Sources */,
 				64AAF0592A83EA0000E8942B /* Double+Ext.swift in Sources */,
+				64BDDB2A2AD7D9C700694210 /* SpreadOrder+Ext.swift in Sources */,
 				8088D77529C3A61000F240CB /* ErrorCheck.swift in Sources */,
+				6486B9672AD0390800D8D5FA /* GreeksMapper.swift in Sources */,
 				64AAF0572A82A3FC00E8942B /* ICandleSymbolProperty.swift in Sources */,
 				64437A922A9DF1DE005929B2 /* NativeInstrumentProfileReader.swift in Sources */,
+				64BDDB1E2AD6CC6A00694210 /* Order.swift in Sources */,
 				64437A8F2A9DEE6F005929B2 /* InstrumentProfile.swift in Sources */,
 				64C771FA2A94D692009868C2 /* ShortSaleRestriction.swift in Sources */,
 				64656F5E2A1B97F2006A0B19 /* NativeFeed.swift in Sources */,
+				6486B97D2AD057F200D8D5FA /* OrderSource.swift in Sources */,
 				64656F6F2A1CFC12006A0B19 /* WeakBox.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2150,9 +2296,11 @@
 				64ACBCEA2A28DDDA00032C53 /* TestEventListener.swift in Sources */,
 				6401A5152A582134009BA686 /* IsolateTest.swift in Sources */,
 				64ACBCCF2A27851C00032C53 /* FeedTest.swift in Sources */,
+				6486B95D2AD0287E00D8D5FA /* DateTests.swift in Sources */,
 				6447A5ED2A8FCC2200739CCF /* UtilsTest.swift in Sources */,
 				64278C6C2A602CA20074B5AA /* CandleTests.swift in Sources */,
 				6498E6B72AB1DACE0093A065 /* ScheduleTest.swift in Sources */,
+				649282ED2AD593F3008F0F04 /* OrderSourceTest.swift in Sources */,
 				6426C8932A531AB500236784 /* ThreadsTest.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
index 8aad9cd05..27d8bcb2f 100644
--- a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
+++ b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
@@ -57,10 +57,10 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "DXFeedIpfConnect Quote https://demo:demo@tools.dxfeed.com/ipf"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "ScheduleSample  /Users/akosylo/test_ipf/schedule.zip  /Users/akosylo/test_ipf/sample.ipf.zip  AAPL  2012-05-26-14:15:00"
+            argument = "ScheduleSample  schedule.zip  sample.ipf.zip  AAPL  2012-05-26-14:15:00"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
@@ -72,8 +72,8 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "Connect mddqa.in.devexperts.com:7400 Quote AAPL"
-            isEnabled = "NO">
+            argument = "Connect mddqa.in.devexperts.com:7400 OptionSale AAPL"
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "LatencyTest mddqa.in.devexperts.com:7400 TimeAndSale ETH/USD:GDAX"
diff --git a/DXFeedFramework/Events/EventCode.swift b/DXFeedFramework/Events/EventCode.swift
index 439b1f615..d7cb0348d 100644
--- a/DXFeedFramework/Events/EventCode.swift
+++ b/DXFeedFramework/Events/EventCode.swift
@@ -15,25 +15,38 @@ public enum EventCode: CaseIterable {
     case quote
     /// See ``Profile``
     case profile
+    /// See ``Summary``
     case summary
+    /// See ``Greeks``
     case greeks
     /// See ``Candle``
     case candle
+    /// **Deprecated. Doesn't need to be implemented**
     case dailyCandle
+    /// See ``Underlying``
     case underlying
+    /// See ``TheoPrice``
     case theoPrice
     /// See ``Trade``
     case trade
     /// See ``TradeETH``
     case tradeETH
+    /// **Not implemented**
     case configuration
+    /// **Not implemented**
     case message
     /// See ``TimeAndSale``
     case timeAndSale
+    /// **Doesn't need to be implemented. Abstract class**
     case orderBase
+    /// See ``AnalyticOrder``
     case order
+    /// See ``AnalyticOrder``
     case analyticOrder
+    /// See ``SpreadOrder``
     case spreadOrder
+    /// See ``Series``
     case series
+    /// See ``OptionSale``
     case optionSale
 }
diff --git a/DXFeedFramework/Events/Market/AnalyticOrder.swift b/DXFeedFramework/Events/Market/AnalyticOrder.swift
new file mode 100644
index 000000000..100fb65f9
--- /dev/null
+++ b/DXFeedFramework/Events/Market/AnalyticOrder.swift
@@ -0,0 +1,73 @@
+//
+//  AnalyticOrder.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 11.10.23.
+//
+
+import Foundation
+/// Represents an extension of ``Order`` introducing analytics information,
+/// e.g. adding to this order iceberg related information ``icebergPeakSize``, ``IcebergHiddenSize``, ``IcebergExecutedSize``
+///
+/// The collection of analytic order events of a symbol represents the most recent analytic information
+/// that is available about orders on the market at any given moment of time.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/market/AnalyticOrder.html)
+public class AnalyticOrder: OrderBase {
+    public override var type: EventCode {
+        return .analyticOrder
+    }
+    /*
+     * Analytic flags property has several significant bits that are packed into an integer in the following way:
+     *      31...2       1    0
+     * +--------------+-------+-------+
+     * |              |   IcebergType |
+     * +--------------+-------+-------+
+     */
+
+    // TYPE values are taken from Type enum.
+    private let icebergTypeMask = 3
+    private let icebergTypeShift = 0
+
+    /// Gets or sets iceberg peak size of this analytic order.
+    public var icebergPeakSize: Double = .nan
+    /// Gets or sets iceberg hidden size of this analytic order.
+    public var icebergHiddenSize: Double = .nan
+    /// Gets or sets iceberg executed size of this analytic order.
+    public var icebergExecutedSize: Double = .nan
+    /// Gets or sets iceberg type of this analytic order.
+    public var icebergFlags: Int32 = 0
+    /// Initializes a new instance of the <see cref="AnalyticOrder"/> class.
+    public override init(_ eventSymbol: String) {
+        super.init(eventSymbol)
+    }
+
+    /// Returns string representation of this candle event.
+    public override func toString() -> String {
+        return
+"""
+AnalyticOrder{\(baseFieldsToString()), \
+icebergPeakSize=\(icebergPeakSize), \
+icebergHiddenSize=\(icebergHiddenSize) +
+icebergExecutedSize=\(icebergExecutedSize) +
+icebergType=\(icebergType)}
+"""
+    }
+}
+
+extension AnalyticOrder {
+    /// Gets or sets iceberg type of this analytic order.
+    public var icebergType: IcebergType {
+        get {
+            IcebergTypeExt.valueOf(value: BitUtil.getBits(flags: Int(icebergFlags),
+                                                          mask: icebergTypeMask,
+                                                          shift: icebergTypeShift))
+        }
+        set {
+            icebergFlags = Int32(BitUtil.setBits(flags: Int(icebergFlags),
+                                                 mask: icebergTypeMask,
+                                                 shift: icebergTypeShift,
+                                                 bits: newValue.rawValue))
+        }
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Extensions/MarketEvent+Access.swift b/DXFeedFramework/Events/Market/Extensions/MarketEvent+Access.swift
index 6d6f51bb5..bb4e76ab0 100644
--- a/DXFeedFramework/Events/Market/Extensions/MarketEvent+Access.swift
+++ b/DXFeedFramework/Events/Market/Extensions/MarketEvent+Access.swift
@@ -34,4 +34,40 @@ extension MarketEvent {
     public var candle: Candle {
         return (self as? Candle)!
     }
+    /// Use only for event.type is ``EventCode/summary``
+    public var summary: Summary {
+        return (self as? Summary)!
+    }
+    /// Use only for event.type is ``EventCode/greeks``
+    public var greeks: Greeks {
+        return (self as? Greeks)!
+    }
+    /// Use only for event.type is ``EventCode/underlying``
+    public var underlying: Underlying {
+        return (self as? Underlying)!
+    }
+    /// Use only for event.type is ``EventCode/theoPrice``
+    public var theoPrice: TheoPrice {
+        return (self as? TheoPrice)!
+    }
+    /// Use only for event.type is ``EventCode/order``
+    public var order: Order {
+        return (self as? Order)!
+    }
+    /// Use only for event.type is ``EventCode/spreadOrder``
+    public var spreadOrder: SpreadOrder {
+        return (self as? SpreadOrder)!
+    }
+    /// Use only for event.type is ``EventCode/analyticOrder``
+    public var analyticOrder: AnalyticOrder {
+        return (self as? AnalyticOrder)!
+    }
+    /// Use only for event.type is ``EventCode/series``
+    public var series: Series {
+        return (self as? Series)!
+    }
+    /// Use only for event.type is ``EventCode/optionSale``
+    public var optionSale: OptionSale {
+        return (self as? OptionSale)!
+    }
 }
diff --git a/DXFeedFramework/Events/Market/Direction.swift b/DXFeedFramework/Events/Market/Extra/Direction.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/Direction.swift
rename to DXFeedFramework/Events/Market/Extra/Direction.swift
diff --git a/DXFeedFramework/Events/Market/IEventType.swift b/DXFeedFramework/Events/Market/Extra/IEventType.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/IEventType.swift
rename to DXFeedFramework/Events/Market/Extra/IEventType.swift
diff --git a/DXFeedFramework/Events/Market/IIndexedEvent.swift b/DXFeedFramework/Events/Market/Extra/IIndexedEvent.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/IIndexedEvent.swift
rename to DXFeedFramework/Events/Market/Extra/IIndexedEvent.swift
diff --git a/DXFeedFramework/Events/Market/ILastingEvent.swift b/DXFeedFramework/Events/Market/Extra/ILastingEvent.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/ILastingEvent.swift
rename to DXFeedFramework/Events/Market/Extra/ILastingEvent.swift
diff --git a/DXFeedFramework/Events/Market/ITimeSeriesEvent.swift b/DXFeedFramework/Events/Market/Extra/ITimeSeriesEvent.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/ITimeSeriesEvent.swift
rename to DXFeedFramework/Events/Market/Extra/ITimeSeriesEvent.swift
diff --git a/DXFeedFramework/Events/Market/Extra/IcebergType.swift b/DXFeedFramework/Events/Market/Extra/IcebergType.swift
new file mode 100644
index 000000000..4c820928a
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Extra/IcebergType.swift
@@ -0,0 +1,32 @@
+//
+//  IcebergType.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 11.10.23.
+//
+
+import Foundation
+
+/// Type of an iceberg order.
+public enum IcebergType: Int, CaseIterable {
+    /// Iceberg type is undefined, unknown or inapplicable.
+    case undefined = 0
+    /// Represents native (exchange-managed) iceberg type.
+    case native
+    /// Represents synthetic (managed outside of the exchange) iceberg type.
+    case synthetic
+}
+
+/// Class extension for  ``IcebergType`` enum.
+public class IcebergTypeExt {
+    private static let values: [IcebergType] =
+    EnumUtil.createEnumBitMaskArrayByValue(defaultValue: .undefined, allCases: IcebergType.allCases)
+
+    /// Returns an enum constant of the``IcebergType`` by integer code bit pattern.
+    /// - Parameters:
+    ///   - value: Property value
+    /// - Returns: The enum constant of the specified enum type with the specified value
+    public static func valueOf(value: Int) -> IcebergType {
+        return values[value]
+    }
+}
diff --git a/DXFeedFramework/Events/Market/IndexedEventSource.swift b/DXFeedFramework/Events/Market/Extra/IndexedEventSource.swift
similarity index 90%
rename from DXFeedFramework/Events/Market/IndexedEventSource.swift
rename to DXFeedFramework/Events/Market/Extra/IndexedEventSource.swift
index 7c34ae30b..9fbc4553e 100644
--- a/DXFeedFramework/Events/Market/IndexedEventSource.swift
+++ b/DXFeedFramework/Events/Market/Extra/IndexedEventSource.swift
@@ -16,14 +16,14 @@ public class IndexedEventSource {
     public let name: String
 
     /// The default source with zero identifier for all events that do not support multiple sources.
-    static let defaultSource =  IndexedEventSource(identifier: 0, name: "DEFAULT")
+    public static let defaultSource =  IndexedEventSource( 0, "DEFAULT")
 
     /// Initializes a new instance of the ``IndexedEventSource`` class.
     ///
     /// - Parameters:
     ///     - identifier: The identifier
     ///     - name: The name of identifier
-    public init(identifier: Int, name: String) {
+    public init(_ identifier: Int, _ name: String) {
         self.name = name
         self.identifier = identifier
     }
diff --git a/DXFeedFramework/Events/Market/MarketEvent.swift b/DXFeedFramework/Events/Market/Extra/MarketEvent.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/MarketEvent.swift
rename to DXFeedFramework/Events/Market/Extra/MarketEvent.swift
diff --git a/DXFeedFramework/Events/Market/Extra/OrderAction.swift b/DXFeedFramework/Events/Market/Extra/OrderAction.swift
new file mode 100644
index 000000000..22d613e5d
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Extra/OrderAction.swift
@@ -0,0 +1,39 @@
+//
+//  OrderAction.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+
+public enum OrderAction: Int, CaseIterable {
+    /// Default enum value for orders that do not support "Full Order Book" and for backward compatibility -
+    /// action must be derived from other ``Order``
+    case undefined = 0
+    /// New Order is added to Order Book.
+    case new
+    /// Order is modified and price-time-priority is not maintained (i.e. order has re-entered Order Book).
+    case replace
+    /// Order is modified without changing its price-time-priority (usually due to partial cancel by user).
+    case modify
+    /// Order is fully canceled and removed from Order Book.
+    case delete
+    /// Size is changed (usually reduced) due to partial order execution.
+    case partial
+    /// Order is fully executed and removed from Order Book.
+    case execute
+    /// Non-Book Trade - this Trade not refers to any entry in Order Book.
+    case trade
+    /// Prior Trade/Order Execution bust
+    case bust
+}
+
+internal class OrderActionExt {
+    private static let values: [OrderAction] =
+    EnumUtil.createEnumBitMaskArrayByValue(defaultValue: .undefined, allCases: OrderAction.allCases)
+
+    public static func valueOf(value: Int) -> OrderAction {
+        return values[value]
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Extra/OrderBase.swift b/DXFeedFramework/Events/Market/Extra/OrderBase.swift
new file mode 100644
index 000000000..e048acb1f
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Extra/OrderBase.swift
@@ -0,0 +1,314 @@
+//
+//  OrderBase.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+
+public class OrderBase: MarketEvent, IIndexedEvent, CustomStringConvertible {
+
+    public private(set) var type: EventCode = .orderBase
+
+    public var eventSource: IndexedEventSource {
+        get {
+            var sourceId = index >> 48
+            if !OrderSource.isSpecialSourceId(sourceId: Int(sourceId)) {
+                sourceId = index >> 32
+            }
+            if let value = try? OrderSource.valueOf(identifier: Int(sourceId)) {
+                return value
+            }
+            fatalError("Incorrect value for eventsource \(self)")
+        }
+        set {
+            let shift = OrderSource.isSpecialSourceId(sourceId: newValue.identifier) ? 48 : 32
+            let mask = OrderSource.isSpecialSourceId(sourceId: Int(index >> 48)) ? ~(Long(-1) << 48) : ~(Long(-1) << 32)
+            index = (Long(newValue.identifier << shift)) | (index & mask)
+        }
+    }
+
+    public var eventFlags: Int32 = 0
+
+    public var index: Long = 0 {
+        didSet {
+            if index < 0 {
+                index = 0
+                print("Negative index for \(self)")
+            }
+        }
+    }
+
+    public var eventSymbol: String
+
+    public var eventTime: Int64 = 0
+    /*
+     * Flags property has several significant bits that are packed into an integer in the following way:
+     *   31..15   14..11    10..4    3    2    1    0
+     *), \--------+--------+--------+----+----+----+----+
+     * |        | Action |Exchange|  Side   |  Scope  |
+     *), \--------+--------+--------+----+----+----+----+
+     */
+
+    // ACTION values are taken from OrderAction enum.
+    private static let actionMask = 0x0f
+    private static let actionShift = 11
+
+    // EXCHANGE values are ASCII chars in [0, 127].
+    private static let exchangeMask = 0x7f
+    private static let exchangeShift = 4
+
+    // SIDE values are taken from Side enum.
+    private static let sideMask = 3
+    private static let sideShift = 2
+
+    // SCOPE values are taken from Scope enum.
+    private static let scopeMask = 3
+    private static let scopeShift = 0
+    /*
+     * Index field contains source identifier, optional exchange code and low-end index (virtual id or MMID).
+     * Index field has 2 formats depending on whether source is "special" (see OrderSource.IsSpecialSourceId()).
+     * Note: both formats are IMPLEMENTATION DETAILS, they are subject to change without notice.
+     *   63..48   47..32   31..16   15..0
+     *), \--------+--------+--------+--------+
+     * | Source |Exchange|      Index      |  <- "special" order sources (non-printable id with exchange)
+     *), \--------+--------+--------+--------+
+     *   63..48   47..32   31..16   15..0
+     *), \--------+--------+--------+--------+
+     * |     Source      |      Index      |  <- generic order sources (alphanumeric id without exchange)
+     *), \--------+--------+--------+--------+
+     * Note: when modifying formats track usages of getIndex/setIndex, getSource/setSource and isSpecialSourceId
+     * methods in order to find and modify all code dependent on current formats.
+     */
+
+    /*
+     * EventFlags property has several significant bits that are packed into an integer in the following way:
+     *    31..7    6    5    4    3    2    1    0
+     *), \---------+----+----+----+----+----+----+----+
+     * |         | SM |    | SS | SE | SB | RE | TX |
+     *), \---------+----+----+----+----+----+----+----+
+     */
+
+    /// Gets or sets time and sequence of this order packaged into single long value
+    ///
+    /// This method is intended for efficient order time priority comparison.
+    /// **Do not set their property directly.**
+    /// 
+    /// Sets ``time`` and/or ``setSequence(_:)``.
+    public internal(set) var timeSequence: Long = 0
+    /// Gets or sets microseconds and nanoseconds time part of this order.
+    public var timeNanoPart: Int32 = 0
+    /// Gets or sets time of the last ``action``
+    public var actionTime: Int64 = 0
+    /// Gets or sets order ID if available.
+    /// Some actions ``OrderAction/trade``, ``OrderAction/bust``
+    /// have no order ID since they are not related to any order in Order book.
+    public var orderId: Int64 = 0
+    /// Gets or sets order ID if available.
+    /// Returns auxiliary order ID if available:.
+    /// ``OrderAction/new`` ID of the order replaced by this new order.
+    /// ``OrderAction/delete`` - ID of the order that replaces this deleted order.
+    /// ``OrderAction/partial`` - ID of the aggressor order.
+    /// ``OrderAction/execute`` - ID of the aggressor order.
+    public var auxOrderId: Int64 = 0
+    /// Gets or sets price of this order event.
+    public var price: Double = .nan
+    /// Gets or sets size of this order event as floating number with fractions.
+    public var size: Double = .nan
+    /// Gets or sets executed size of this order.
+    public var executedSize: Double = .nan
+    /// Gets or sets number of individual orders in this aggregate order.
+    public var count: Int64 = 0
+    /// Gets or sets implementation-specific flags.
+    /// **Do not use this property directly.**
+    var flags: Int32 = 0
+    /// Gets or sets trade (order execution) ID for events containing trade-related action.
+    /// Returns 0 if trade ID not available.
+    public var tradeId: Int64 = 0
+    /// Gets or sets trade price for events containing trade-related action.
+    public var tradePrice: Double = .nan
+    /// Gets or sets trade size for events containing trade-related action.
+    public var tradeSize: Double = .nan
+
+    init(_ eventSymbol: String) {
+        self.eventSymbol = eventSymbol
+    }
+
+    public var description: String {
+"""
+DXFG_ORDER_BASE_T \
+eventSymbol: \(eventSymbol) \
+eventTime: \(eventTime) \
+eventFlags: \(eventFlags), \
+index: \(index), \
+timeSequence: \(timeSequence), \
+timeNanoPart: \(timeNanoPart), \
+actionTime: \(actionTime), \
+orderId: \(orderId), \
+auxOrderId: \(auxOrderId), \
+price: \(price), \
+size: \(size), \
+executedSize: \(executedSize), \
+count: \(count), \
+flags: \(flags), \
+tradeId: \(tradeId), \
+tradePrice: \(tradePrice), \
+tradeSize: \(tradeSize)
+"""
+        }
+    /// Returns string representation of this candle event.
+    public func toString() -> String {
+        return "OrderBase{\(baseFieldsToString())}"
+    }
+}
+
+extension OrderBase {
+    /// Gets a value indicating whether this order has some size
+    public func hsaSize() -> Bool {
+        return size != 0 && !size.isNaN
+    }
+    /// Gets exchange code of this order.
+    public func getExchangeCode() -> Character {
+        return Character(BitUtil.getBits(flags: Int(flags),
+                                         mask: OrderBase.exchangeMask,
+                                         shift: OrderBase.exchangeShift))
+    }
+
+    /// Gets exchange code of this order.
+    public func getExchangeCode() -> Int {
+        return BitUtil.getBits(flags: Int(flags),
+                               mask: OrderBase.exchangeMask,
+                               shift: OrderBase.exchangeShift)
+    }
+    /// Sets exchange code of this order.
+    ///
+    ///  - Throws: ``ArgumentException/exception(_:)``
+    public func setExchangeCode(_ code: Character) throws {
+        try StringUtil.checkChar(char: code, mask: OrderBase.exchangeMask, name: "exchangeCode")
+        if let value = code.unicodeScalars.first?.value {
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: OrderBase.exchangeMask,
+                                          shift: OrderBase.exchangeShift,
+                                          bits: Int(value)))
+        }
+    }
+
+    /// Gets or sets side of this order.
+    public var orderSide: Side {
+        get {
+            Side.valueOf(Int(BitUtil.getBits(flags: Int(flags), mask: OrderBase.sideMask, shift: OrderBase.sideShift)))
+        }
+        set {
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: OrderBase.sideMask,
+                                          shift: OrderBase.sideShift,
+                                          bits: newValue.rawValue))
+        }
+    }
+
+    /// Gets or sets time of this order.
+    /// Time is measured in milliseconds between the current time and midnight, January 1, 1970 UTC.
+    public var time: Long {
+        get {
+            ((timeSequence >> 32) * 1000) + ((timeSequence >> 22) & 0x3ff)
+        }
+        set {
+            timeSequence = Long(TimeUtil.getSecondsFromTime(newValue) << 32) |
+            (Long(TimeUtil.getMillisFromTime(newValue)) << 22) |
+            Long(getSequence())
+        }
+    }
+
+    /// Gets sequence number of this order to distinguish events that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    public func getSequence() -> Int {
+        return Int(index) & Int(MarketEventConst.maxSequence)
+    }
+    /// Sets sequence number of this order to distinguish quotes that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func setSequence(_ sequence: Int) throws {
+        if sequence < 0 || sequence > MarketEventConst.maxSequence {
+            throw ArgumentException.exception(
+                "Sequence(\(sequence) is < 0 or > MaxSequence(\(MarketEventConst.maxSequence)"
+            )
+        }
+        index = Long(index & ~Long(MarketEventConst.maxSequence)) | Long(sequence)
+    }
+
+    /// Gets or sets timestamp of the original event in nanoseconds
+    /// Time is measured in nanoseconds between the current time and midnight, January 1, 1970 UTC.
+    public var timeNanos: Long {
+        get {
+            TimeNanosUtil.getNanosFromMillisAndNanoPart(time, timeNanoPart)
+        }
+        set {
+            time = TimeNanosUtil.getNanoPartFromNanos(newValue)
+            timeNanoPart = Int32(TimeNanosUtil.getNanoPartFromNanos(newValue))
+        }
+    }
+
+    /// Gets or sets action of this order.
+    /// Returns order action if available, otherwise ``OrderAction/undefined``
+    public var action: OrderAction {
+        get {
+            return OrderActionExt.valueOf(value: BitUtil.getBits(flags: Int(flags),
+                                                                 mask: OrderBase.actionMask,
+                                                                 shift: OrderBase.actionShift))
+        }
+        set {
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: OrderBase.actionMask,
+                                          shift: OrderBase.actionShift,
+                                          bits: newValue.rawValue))
+        }
+    }
+
+    /// Gets or sets scope of this order.
+    public var scope: Scope {
+        get {
+            return ScopeExt.valueOf(value: BitUtil.getBits(flags: Int(flags),
+                                                           mask: OrderBase.scopeMask,
+                                                           shift: OrderBase.scopeShift))
+        }
+
+        set {
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: OrderBase.scopeMask,
+                                          shift: OrderBase.scopeShift,
+                                          bits: newValue.rawValue))
+        }
+    }
+
+    /// Returns string representation of this candle fields.
+    func baseFieldsToString() -> String {
+        return
+"""
+\(eventSymbol), \
+eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
+source=\(eventSource.name), \
+eventFlags=0x\(String(format: "%02X", eventFlags)), \
+index=0x\(String(format: "%02X", index)), \
+time=\(TimeUtil.toLocalDateString(millis: time)), \
+sequence=\(getSequence()), \
+timeNanoPart=\(timeNanoPart), \
+action=\(action), \
+actionTime=\(TimeUtil.toLocalDateString(millis: actionTime)), \
+orderId=\(orderId), \
+auxOrderId=\(auxOrderId), \
+price=\(price), \
+size=\(size), \
+executedSize=\(executedSize), \
+count=\(count), \
+exchange=\(StringUtil.encodeChar(char: Int16(getExchangeCode()))), \
+side=\(orderSide), \
+scope=\(scope), \
+tradeId=\(tradeId), \
+tradePrice=\(tradePrice), \
+tradeSize=\(tradeSize)
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Extra/OrderSource.swift b/DXFeedFramework/Events/Market/Extra/OrderSource.swift
new file mode 100644
index 000000000..ab9977860
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Extra/OrderSource.swift
@@ -0,0 +1,357 @@
+//
+//  OrderSource.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+
+/// Identifies source of ``Order``, ``AnalyticOrder``, ``OtcMarketsOrder`` and ``SpreadOrder`` events.
+///
+/// There are the following kinds of order sources:
+///
+/// Synthetic sources ``COMPOSITE_BID``, ``COMPOSITE_ASK``,
+///     ``REGIONAL_BID``, and ``REGIONAL_ASK`` are provided for convenience of a consolidated
+///     order book and are automatically generated based on the corresponding ``Quote`` events.
+/// Aggregate sources ``AGGREGATE_BID`` and ``AGGREGATE_ASK`` provide
+///     futures depth (aggregated by price level) and NASDAQ Level II (top of book for each market maker).
+///     These source cannot be directly published to via dxFeed API.
+/// ``isPublishable(Class) Publishable`` sources ``DEFAULT``, ``NTV``, and ``ISE``
+///     support full range of dxFeed API features.
+///
+///
+
+public class OrderSource: IndexedEventSource {
+    private static let pubOrder = 0x0001
+    private static let pubAnalyticOrder = 0x0002
+    private static let pubOtcMarketsOrder = 0x0004
+    private static let pubSpreadOrder = 0x0008
+    private static let fullOrderBook = 0x0010
+    private static let flagsSize = 5
+
+    private let pubFlags: Int
+    private let isBuiltin: Bool
+
+    static private let sourcesById = ConcurrentDict<Int, OrderSource>()
+    static private let sourcesByName = ConcurrentDict<String, OrderSource>()
+    private let sourcesByIdCache = NSCache<AnyObject, OrderSource>()
+
+    /// The default source with zero identifier for all events that do not support multiple sources.
+    public static let defaultOrderSource =
+    try? OrderSource(0, "DEFAULT", pubOrder | pubAnalyticOrder | pubSpreadOrder | fullOrderBook)
+
+    /// Bid side of a composite ``Quote``
+    ///
+    /// It is a synthetic source.
+    /// The subscription on composite ``Quote`` event is observed when this source is subscribed to.
+    public static let compsoiteBid =
+    try? OrderSource(1, "COMPOSITE_BID", pubOrder | pubAnalyticOrder | pubSpreadOrder | fullOrderBook)
+    /// Ask side of a composite ``Quote``.
+    /// It is a synthetic source.
+    /// The subscription on composite ``Quote`` event is observed when this source is subscribed to.
+    public static let compsoiteAsk = try? OrderSource(2, "COMPOSITE_ASK", 0)
+    /// Bid side of a regional ``Quote``.
+    /// It is a synthetic source.
+    /// The subscription on regional ``Quote`` event is observed when this source is subscribed to.
+
+    public static let regionalBid = try? OrderSource(3, "REGIONAL_BID", 0)
+    /// Ask side of a regional ``Quote``.
+    /// It is a synthetic source.
+    /// The subscription on regional ``Quote`` event is observed when this source is subscribed to.
+
+    public static let regionalAsk = try? OrderSource(4, "REGIONAL_ASK", 0)
+    /// Bid side of an aggregate order book (futures depth and NASDAQ Level II).
+    /// This source cannot be directly published via dxFeed API, but otherwise it is fully operational.
+    public static let agregateBid = try? OrderSource(5, "AGGREGATE_BID", 0)
+
+    /// Ask side of an aggregate order book (futures depth and NASDAQ Level II).
+    /// This source cannot be directly published via dxFeed API, but otherwise it is fully operational.
+    public static let agregateAsk = try? OrderSource(6, "AGGREGATE_ASK", 0)
+
+    /// NASDAQ Total View.
+    public static let NTV = try? OrderSource("NTV", pubOrder | fullOrderBook)
+
+    /// NASDAQ Total View. Record for price level book.
+    public static let ntv = try? OrderSource("ntv", pubOrder)
+
+    /// NASDAQ Futures Exchange.
+    public static let NFX = try? OrderSource("NFX", pubOrder)
+
+    /// NASDAQ eSpeed.
+    public static let ESPD = try? OrderSource("ESPD", pubOrder)
+
+    /// NASDAQ Fixed Income.
+    public static let XNFI = try? OrderSource("XNFI", pubOrder)
+
+    /// Intercontinental Exchange.
+    public static let ICE = try? OrderSource("ICE", pubOrder)
+
+    /// International Securities Exchange.
+    public static let ISE = try? OrderSource("ISE", pubOrder | pubSpreadOrder)
+
+    /// Direct-Edge EDGA Exchange.
+    public static let DEA = try? OrderSource("DEA", pubOrder)
+
+    /// Direct-Edge EDGX Exchange.
+    public static let DEX = try? OrderSource("DEX", pubOrder)
+
+    /// Bats BYX Exchange.
+    public static let BYX = try? OrderSource("BYX", pubOrder)
+
+    /// Bats BZX Exchange.
+    public static let BZX = try? OrderSource("BZX", pubOrder)
+
+    /// Bats Europe BXE Exchange.
+    public static let BATE = try? OrderSource("BATE", pubOrder)
+
+    /// Bats Europe CXE Exchange.
+    public static let CHIX = try? OrderSource("CHIX", pubOrder)
+
+    /// Bats Europe DXE Exchange.
+    public static let CEUX = try? OrderSource("CEUX", pubOrder)
+
+    /// Bats Europe TRF.
+    public static let BXTR = try? OrderSource("BXTR", pubOrder)
+
+    /// Borsa Istanbul Exchange.
+    public static let IST = try? OrderSource("IST", pubOrder)
+
+    /// Borsa Istanbul Exchange. Record for particular top 20 order book.
+    public static let BI20 = try? OrderSource("BI20", pubOrder)
+
+    /// ABE (abe.io) exchange.
+    public static let ABE = try? OrderSource("ABE", pubOrder)
+
+    /// FAIR (FairX) exchange.
+    public static let FAIR = try? OrderSource("FAIR", pubOrder)
+
+    /// CME Globex.
+    public static let GLBX = try? OrderSource("GLBX", pubOrder | pubAnalyticOrder)
+
+    /// CME Globex. Record for price level book.
+    public static let glbx = try? OrderSource("glbx", pubOrder)
+
+    /// Eris Exchange group of companies.
+    public static let ERIS = try? OrderSource("ERIS", pubOrder)
+
+    /// Eurex Exchange.
+    public static let XEUR = try? OrderSource("XEUR", pubOrder)
+
+    /// Eurex Exchange. Record for price level book.
+    public static let xeur = try? OrderSource("xeur", pubOrder)
+
+    /// CBOE Futures Exchange.
+    public static let CFE = try? OrderSource("CFE", pubOrder)
+
+    /// CBOE Options C2 Exchange.
+    public static let C2OX = try? OrderSource("C2OX", pubOrder)
+
+    /// Small Exchange.
+    public static let SMFE = try? OrderSource("SMFE", pubOrder)
+
+    /// Small Exchange. Record for price level book.
+    public static let smfe = try? OrderSource("smfe", pubOrder)
+
+    /// Investors exchange. Record for price level book.
+    public static let iex = try? OrderSource("iex", pubOrder)
+
+    /// Members Exchange.
+    public static let MEMX = try? OrderSource("MEMX", pubOrder)
+
+    /// Members Exchange. Record for price level book.
+    public static let memx = try? OrderSource("memx", pubOrder)
+
+    /// Don't use it. Just for initialization all static variable.
+    /// static let - is always lazy initialized
+    fileprivate static let allValues = [OrderSource.defaultOrderSource,
+                             OrderSource.compsoiteBid,
+                             OrderSource.compsoiteAsk,
+                             OrderSource.regionalBid,
+                             OrderSource.regionalAsk,
+                             OrderSource.agregateBid,
+                             OrderSource.agregateAsk,
+                             OrderSource.NTV,
+                             OrderSource.ntv,
+                             OrderSource.NFX,
+                             OrderSource.ESPD,
+                             OrderSource.XNFI,
+                             OrderSource.ICE,
+                             OrderSource.ISE,
+                             OrderSource.DEA,
+                             OrderSource.DEX,
+                             OrderSource.BYX,
+                             OrderSource.BZX,
+                             OrderSource.BATE,
+                             OrderSource.CHIX,
+                             OrderSource.CEUX,
+                             OrderSource.BXTR,
+                             OrderSource.IST,
+                             OrderSource.BI20,
+                             OrderSource.ABE,
+                             OrderSource.FAIR,
+                             OrderSource.GLBX,
+                             OrderSource.glbx,
+                             OrderSource.ERIS,
+                             OrderSource.XEUR,
+                             OrderSource.xeur,
+                             OrderSource.CFE,
+                             OrderSource.C2OX,
+                             OrderSource.SMFE,
+                             OrderSource.smfe,
+                             OrderSource.iex,
+                             OrderSource.MEMX,
+                             OrderSource.memx]
+
+    override init(_ identifier: Int, _ name: String) {
+        self.pubFlags = 0
+        self.isBuiltin = false
+        super.init(identifier, name)
+    }
+
+    convenience init(_ name: String, _ pubFlags: Int) throws {
+        try self.init(OrderSource.composeId(name: name), name, pubFlags)
+    }
+
+    init(_ identifier: Int, _ name: String, _ pubFlags: Int) throws {
+        self.pubFlags = pubFlags
+        self.isBuiltin = true
+        super.init(identifier, name)
+        switch identifier {
+        case _ where identifier < 0:
+            throw ArgumentException.exception("id is negative")
+        case _ where identifier > 0 && identifier < 0x20 && !OrderSource.isSpecialSourceId(sourceId: identifier):
+            throw ArgumentException.exception("id is not marked as special")
+        case _ where identifier > 0x20:
+            if try (identifier != OrderSource.composeId(name: name))
+                && (name != OrderSource.decodeName(identifier: identifier)) {
+                throw ArgumentException.exception("id does not match name")
+            }
+        default:
+            print("")
+        }
+        // Flag FullOrderBook requires that source must be publishable.
+        if (pubFlags & OrderSource.fullOrderBook) != 0 &&
+            (pubFlags & (OrderSource.pubOrder | OrderSource.pubAnalyticOrder | OrderSource.pubSpreadOrder)) == 0 {
+            throw ArgumentException.exception("Unpublishable full order book order")
+        }
+
+        if !OrderSource.sourcesById.tryInsert(key: identifier, value: self) {
+            throw ArgumentException.exception("duplicate id \(identifier)")
+        }
+        if !OrderSource.sourcesByName.tryInsert(key: name, value: self) {
+            throw ArgumentException.exception("duplicate name \(name)")
+        }
+    }
+
+    /// Determines whether specified source identifier refers to special order source.
+    /// Special order sources are used for wrapping non-order events into order events.
+    internal static func isSpecialSourceId(sourceId: Int) -> Bool {
+        return sourceId >= 1 && sourceId <= 6
+    }
+
+    internal static func composeId(name: String) throws -> Int {
+        var sourceId = 0
+        let count = name.count
+        if count == 0 || count > 4 {
+            return 0
+        }
+        for index in 0..<count {
+            let char = name[index]
+            try OrderSource.check(char: char)
+            sourceId = (sourceId << 8) | Int(char.first?.unicodeScalars.first?.value ?? 0)
+        }
+
+        return sourceId
+    }
+
+    internal static func check(char: String) throws {
+        if char.rangeOfCharacter(from: CharacterSet.alphanumerics.inverted) == nil {
+            return
+        }
+        throw ArgumentException.exception("Source name must contain only alphanumeric characters. Current \(char)")
+    }
+
+    internal static func decodeName(identifier: Int) throws -> String {
+        if identifier == 0 {
+            throw ArgumentException.exception("Source name must contain from 1 to 4 characters. Current \(identifier)")
+        }
+        var name = String()
+        for index in stride(from: 24, through: 0, by: -8) {
+            if identifier >> index == 0 { // Skip highest contiguous zeros.
+                continue
+            }
+            let char = Character(((identifier >> index) & 0xff))
+            try check(char: String(char))
+            name.append(char)
+        }
+        return name
+    }
+    /// Gets a value indicating whether this source supports Full Order Book.
+    public func isFullOrderBook() -> Bool {
+        return (pubFlags & OrderSource.fullOrderBook) != 0
+    }
+
+    /// Gets a value indicating whether the given event type can be directly published with this source.
+    ///
+    /// Subscription on such sources can be observed directly via ``DXPublisher``
+    /// Subscription on such sources is observed via instances of  ``IndexedEventSubscriptionSymbol``
+    /// - Parameters:
+    ///   - eventype : Possible values ``Order``, ``AnalyticOrder``, ``SpreadOrder``
+    /// - Returns: true- events can be directly published with this source
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func isPublishable(eventType: AnyClass.Type) throws -> Bool {
+        return pubFlags & (try OrderSource.getEventTypeMask(eventType)) != 0
+    }
+
+    /// Returns order source for the specified source identifier.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public static func valueOf(identifier: Int) throws -> OrderSource {
+        return try OrderSource.sourcesById.tryGetValue(key: identifier) {
+            let name = try decodeName(identifier: identifier)
+            let source = OrderSource(identifier, name)
+            return source
+        }
+    }
+    /// Returns order source for the specified source name.
+    /// 
+    /// The name must be either predefined, or contain at most 4 alphanumeric characters.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public static func valueOf(name: String) throws -> OrderSource {
+        return try OrderSource.sourcesByName.tryGetValue(key: name) {
+            let identifier = try composeId(name: name)
+            let source = OrderSource(identifier, name)
+            return source
+        }
+    }
+
+    /// Gets type mask by specified event type.
+    ///
+    /// - Parameters:
+    ///   - eventype : Possible values ``Order``, ``AnalyticOrder``, ``SpreadOrder``
+    /// - Returns: The mask for event class.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public static func getEventTypeMask(_ eventType: AnyClass) throws -> Int {
+        if eventType == Order.self {
+            return pubOrder
+        }
+
+        if eventType == AnalyticOrder.self {
+            return pubAnalyticOrder
+        }
+
+        if eventType == SpreadOrder.self {
+            return pubSpreadOrder
+        }
+        throw ArgumentException.exception("Invalid order event type: \(eventType)")
+    }
+
+}
+
+extension OrderSource {
+    /// Don't use it. Just for initialization all static variable. 
+    /// static let - is always lazy initialized
+    internal static func initAllValues() {
+        _ = OrderSource.allValues
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Extra/PriceType.swift b/DXFeedFramework/Events/Market/Extra/PriceType.swift
new file mode 100644
index 000000000..cd659d321
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Extra/PriceType.swift
@@ -0,0 +1,52 @@
+//
+//  PriceType.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+/// This ``DXPriceType`` structure is created to circumvent the limitation that enums in Swift cannot contain stored properties.
+/// The "Enums must not contain stored properties" error occurs when attempting to add a stored property to an enum. Instead, we use this structure to store data that we would like to include in the enum.
+public struct DXPriceType: Equatable {
+    public let name: String
+    /// Get string value of type
+    public let code: Int
+}
+
+extension DXPriceType: ExpressibleByIntegerLiteral {
+    public init(integerLiteral value: Int) {
+        switch value {
+        case 0:
+            name = "REGULAR"
+            code = value
+        case 1:
+            name = "INDICATIVE"
+            code = value
+        case 2:
+            name = "PRELIMINARY"
+            code = value
+        case 3:
+            name = "FINAL"
+            code = value
+        default:
+            fatalError("Try to initialize PriceType with wrong value \(value)")
+        }
+    }
+}
+
+public enum PriceType: DXPriceType, CaseIterable {
+    case regular = 0
+    case indicative = 1
+    case preliminary = 2
+    case final = 3
+
+    private static let types: [PriceType] = {
+        EnumUtil.createEnumBitMaskArrayByValue(defaultValue: .regular,
+                                               allCases: PriceType.allCases)
+    }()
+
+    public static func valueOf(_ value: Int) -> PriceType {
+        return PriceType.types[value]
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Extra/Scope.swift b/DXFeedFramework/Events/Market/Extra/Scope.swift
new file mode 100644
index 000000000..af730fdf2
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Extra/Scope.swift
@@ -0,0 +1,38 @@
+//
+//  Scope.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 11.10.23.
+//
+
+import Foundation
+
+/// Scope of an order.
+public enum Scope: Int, CaseIterable {
+    /// Represents best bid or best offer for the whole market.
+    case composite = 0
+
+    /// Represents best bid or best offer for a given exchange code.
+    case regional
+
+    /// Represents aggregate information for a given price level or
+    /// best bid or best offer for a given market maker.
+    case aggregate
+
+    /// Represents individual order on the market.
+    case order
+}
+
+/// Class extension for ``ScopeExt`` enum.
+public class ScopeExt {
+    private static let values: [Scope] =
+    EnumUtil.createEnumBitMaskArrayByValue(defaultValue: .composite, allCases: Scope.allCases)
+
+    /// Returns an enum constant of the``ScopeExt`` by integer code bit pattern.
+    /// - Parameters:
+    ///   - value: Property value
+    /// - Returns: The enum constant of the specified enum type with the specified value
+    public static func valueOf(value: Int) -> Scope {
+        return values[value]
+    }
+}
diff --git a/DXFeedFramework/Events/Market/ShortSaleRestriction.swift b/DXFeedFramework/Events/Market/Extra/ShortSaleRestriction.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/ShortSaleRestriction.swift
rename to DXFeedFramework/Events/Market/Extra/ShortSaleRestriction.swift
diff --git a/DXFeedFramework/Events/Market/Side.swift b/DXFeedFramework/Events/Market/Extra/Side.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/Side.swift
rename to DXFeedFramework/Events/Market/Extra/Side.swift
diff --git a/DXFeedFramework/Events/Market/TimeAndSaleType.swift b/DXFeedFramework/Events/Market/Extra/TimeAndSaleType.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/TimeAndSaleType.swift
rename to DXFeedFramework/Events/Market/Extra/TimeAndSaleType.swift
diff --git a/DXFeedFramework/Events/Market/TradeBase.swift b/DXFeedFramework/Events/Market/Extra/TradeBase.swift
similarity index 97%
rename from DXFeedFramework/Events/Market/TradeBase.swift
rename to DXFeedFramework/Events/Market/Extra/TradeBase.swift
index c75842fc7..690b63041 100644
--- a/DXFeedFramework/Events/Market/TradeBase.swift
+++ b/DXFeedFramework/Events/Market/Extra/TradeBase.swift
@@ -26,9 +26,11 @@ public class TradeBase: MarketEvent, ILastingEvent {
      */
 
     /// Gets or sets time and sequence of last trade packaged into single long value.
-    /// Do not set this property directly.
+    ///
+    /// **Do not set this property directly.**
+    /// 
     /// Sets ``time`` and/or ``setSequence(_:)``.
-    public var timeSequence: Long = 0
+    public internal(set) var timeSequence: Long = 0
     /// Gets or sets microseconds and nanoseconds time part of the last trade.
     public var timeNanoPart: Int32 = 0
     /// Gets or sets exchange code of the last trade.
@@ -49,7 +51,7 @@ public class TradeBase: MarketEvent, ILastingEvent {
     public var dayTurnover: Double = .nan
     /// Gets or sets implementation-specific flags.
     /// Do not use this method directly.
-    internal var flags: Int32 = 0
+    var flags: Int32 = 0
 
     public init(_ symbol: String) {
         self.eventSymbol = symbol
diff --git a/DXFeedFramework/Events/Market/TradingStatus.swift b/DXFeedFramework/Events/Market/Extra/TradingStatus.swift
similarity index 100%
rename from DXFeedFramework/Events/Market/TradingStatus.swift
rename to DXFeedFramework/Events/Market/Extra/TradingStatus.swift
diff --git a/DXFeedFramework/Events/Market/Greeks.swift b/DXFeedFramework/Events/Market/Greeks.swift
new file mode 100644
index 000000000..7a1a17232
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Greeks.swift
@@ -0,0 +1,135 @@
+//
+//  Greeks.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+/// Greeks event is a snapshot of the option price, Black-Scholes volatility and greeks.
+///
+/// It represents the most recent information that is available about the corresponding values on
+/// the market at any given moment of time.
+///
+/// Some greeks sources provide a consistent view of the set of known greeks.
+/// The corresponding information is carried in ``eventFlags`` property.
+/// The logic behind this property is detailed in ``IIndexedEvent`` class documentation
+///
+/// Multiple event sources for the same symbol are not supported for greeks, thus
+/// ``source`` property is always ``IndexedEventSource/defaultSource``.
+///
+/// Publishing Greeks
+/// Publishing of greeks events follows the general rules explained in ``ITimeSeriesEvent`` class
+/// documentation.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/option/Greeks.html)
+public class Greeks: MarketEvent, ITimeSeriesEvent, ILastingEvent, CustomStringConvertible {
+    public var type: EventCode = .greeks
+
+    public var eventSymbol: String
+
+    public var eventTime: Int64 = 0
+
+    public var eventSource: IndexedEventSource = .defaultSource
+
+    public var eventFlags: Int32 = 0
+
+    public var index: Long = 0
+    /*
+     * EventFlags property has several significant bits that are packed into an integer in the following way:
+     *    31..7    6    5    4    3    2    1    0
+     * +---------+----+----+----+----+----+----+----+
+     * |         | SM |    | SS | SE | SB | RE | TX |
+     * +---------+----+----+----+----+----+----+----+
+     */
+    /// Gets or sets option market price.
+    public var price: Double = .nan
+    /// Gets or sets Black-Scholes implied volatility of the option.
+    public var volatility: Double = .nan
+    /// Gets or sets option delta.
+    /// Delta is the first derivative of an option price by an underlying price.
+    public var delta: Double = .nan
+    /// Gets or sets option gamma.
+    /// Gamma is the second derivative of an option price by an underlying price.
+    public var gamma: Double = .nan
+    /// Gets or sets option theta.
+    /// Theta is the first derivative of an option price by a number of days to expiration.
+    public var theta: Double = .nan
+    /// Gets or sets option rho.
+    /// Rho is the first derivative of an option price by percentage interest rate.
+    public var rho: Double = .nan
+    /// Gets or sets vega.
+    /// Vega is the first derivative of an option price by percentage volatility.
+    public var vega: Double = .nan
+
+    public init(_ eventSymbol: String) {
+        self.eventSymbol = eventSymbol
+    }
+
+    public var description: String {
+        """
+DXFG_GREEKS_T \
+eventSymbol: \(eventSymbol) \
+eventTime: \(eventTime) \
+eventFlags: \(eventFlags), \
+index: \(index), \
+price: \(price), \
+volatility: \(volatility), \
+delta: \(delta), \
+gamma: \(gamma), \
+theta: \(theta), \
+rho: \(rho), \
+vega: \(vega)
+"""
+    }
+}
+
+extension Greeks {
+    /// Gets or sets timestamp of the event in milliseconds.
+    /// Time is measured in milliseconds between the current time and midnight, January 1, 1970 UTC.
+    public var time: Long {
+        get {
+            ((index >> 32) * 1000) + ((index >> 22) & 0x3ff)
+        }
+        set {
+            index = Long(TimeUtil.getSecondsFromTime(newValue) << 32) |
+            (Long(TimeUtil.getMillisFromTime(newValue)) << 22) |
+            Int64(getSequence())
+        }
+    }
+    /// Gets sequence number of this quote to distinguish events that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    public func getSequence() -> Int {
+        return Int(index) & Int(MarketEventConst.maxSequence)
+    }
+    /// Sets sequence number of this quote to distinguish quotes that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func setSequence(_ sequence: Int) throws {
+        if sequence < 0 || sequence > MarketEventConst.maxSequence {
+            throw ArgumentException.exception(
+                "Sequence(\(sequence) is < 0 or > MaxSequence(\(MarketEventConst.maxSequence)"
+            )
+        }
+        index = Long(index & ~Long(MarketEventConst.maxSequence)) | Long(sequence)
+    }
+    /// Returns string representation of this greeks fields.
+    public func toString() -> String {
+        return """
+Greeks{\(eventSymbol), \
+eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
+eventFlags=0x\(String(format: "%02X", eventFlags)), \
+time=\(TimeUtil.toLocalDateString(millis: time)), \
+sequence=\(self.getSequence()), \
+price=\(price), \
+volatility=\(volatility), \
+delta=\(delta), \
+gamma=\(gamma), \
+theta=\(theta), \
+rho=\(rho), \
+vega=\(vega)}
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/OptionSale.swift b/DXFeedFramework/Events/Market/OptionSale.swift
new file mode 100644
index 000000000..0a04c6c3a
--- /dev/null
+++ b/DXFeedFramework/Events/Market/OptionSale.swift
@@ -0,0 +1,266 @@
+//
+//  OptionSale.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 13.10.23.
+//
+
+import Foundation
+
+/// Option Sale event represents a trade or another market event with the price
+/// (for example, market open/close price, etc.) for each option symbol listed under the specified Underlying.
+///
+/// Option Sales are intended to provide information about option trades **in a continuous time slice** with
+/// the additional metrics, like Option Volatility, Option Delta, and Underlying Price.
+///
+/// Option Sale events have unique ``index``
+/// which can be used for later correction/cancellation processing.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/market/OptionSale.html)
+public class OptionSale: MarketEvent, IIndexedEvent {
+    public var type: EventCode = .optionSale
+
+    public var eventSource: IndexedEventSource = .defaultSource
+
+    public var eventFlags: Int32 = 0
+
+    public var index: Long = 0
+
+    public var eventSymbol: String
+
+    public var eventTime: Int64 = 0
+
+    /*
+     * EventFlags property has several significant bits that are packed into an integer in the following way:
+     *    31..7    6    5    4    3    2    1    0
+     * +--------+----+----+----+----+----+----+----+
+     * |        | SM |    | SS | SE | SB | RE | TX |
+     * +--------+----+----+----+----+----+----+----+
+     */
+
+    /// Gets or sets time and sequence of this series packaged into single long value.
+    ///
+    /// This method is intended for efficient series time priority comparison.
+    /// **Do not use this property directly**
+    /// 
+    /// Change ``time`` and/or  ``setSequence(_:)``
+    public internal(set) var timeSequence: Long = 0
+    /// Gets or sets microseconds and nanoseconds time part of event.
+    public var timeNanoPart: Int32 = 0
+    /// Gets or sets exchange code of this option sale event.
+    public var exchangeCode: Int16 = 0
+    /// Gets or sets price of this option sale event.
+    public var price: Double = .nan
+    /// Gets or sets size this option sale event as floating number with fractions.
+    public var size: Double = .nan
+    /// Gets or sets the current bid price on the market when this option sale event had occurred.
+    public var bidPrice: Double = .nan
+    /// Gets or sets the current ask price on the market when this option sale event had occurred.
+    public var askPrice: Double = .nan
+    /// Gets or sets sale conditions provided for this event by data feed.
+    ///
+    /// This field format is specific for every particular data feed.
+    public var exchangeSaleConditions: String = ""
+    /// Gets or sets implementation-specific flags.
+    ///
+    /// **Do not use this method directly.**
+    var flags: Int32 = 0
+    /// Gets or sets underlying price at the time of this option sale event.
+    public var underlyingPrice: Double = .nan
+    /// Gets or sets Black-Scholes implied volatility of the option at the time of this option sale event.
+    public var volatility: Double = .nan
+    /// Gets or sets option delta at the time of this option sale event.
+    /// Delta is the first derivative of an option price by an underlying price.
+    public var delta: Double = .nan
+    /// Gets or sets option symbol of this event.
+    public var optionSymbol: String = ""
+
+    public init(_ eventSymbol: String) {
+        self.eventSymbol = eventSymbol
+    }
+}
+
+extension OptionSale {
+    /// Gets or sets timestamp of the event in milliseconds.
+    /// Time is measured in milliseconds between the current time and midnight, January 1, 1970 UTC.
+    public var time: Long {
+        get {
+            ((timeSequence >> 32) * 1000) + ((timeSequence >> 22) & 0x3ff)
+        }
+        set {
+            timeSequence = Long(TimeUtil.getSecondsFromTime(newValue) << 32) |
+            (Long(TimeUtil.getMillisFromTime(newValue)) << 22) |
+            Int64(getSequence())
+        }
+    }
+
+    /// Gets or sets time of the last trade in nanoseconds.
+    /// Time is measured in nanoseconds between the current time and midnight, January 1, 1970 UTC.
+    public var timeNanos: Long {
+        get {
+            TimeNanosUtil.getNanosFromMillisAndNanoPart(time, timeNanoPart)
+        }
+        set {
+            time = TimeNanosUtil.getNanoPartFromNanos(newValue)
+            timeNanoPart = Int32(TimeNanosUtil.getNanoPartFromNanos(newValue))
+        }
+    }
+
+    /// Gets sequence number of the last trade to distinguish trades that have the same ``time``.
+    ///
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    public func getSequence() -> Int {
+        return Int(timeSequence) & Int(MarketEventConst.maxSequence)
+    }
+
+    /// Sets sequence number of the last trade to distinguish trades that have the same ``time``.
+    ///
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    ///
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func setSequence(_ sequence: Int) throws {
+        if sequence < 0 && sequence > MarketEventConst.maxSequence {
+            throw ArgumentException.exception(
+                "Sequence(\(sequence) is < 0 or > MaxSequence(\(MarketEventConst.maxSequence)"
+            )
+        }
+        timeSequence = (timeSequence & Long(~MarketEventConst.maxSequence)) | Int64(sequence)
+    }
+
+    /// Gets  TradeThroughExempt flag of this option sale event.
+    public func getTradeThroughExempt() -> Character {
+        Character(BitUtil.getBits(flags: Int(flags),
+                                  mask: TimeAndSale.tteMask,
+                                  shift: TimeAndSale.tteShift))
+    }
+    /// Sets  TradeThroughExempt flag of this option sale event.
+    ///
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func setTradeThroughExempt(_ char: Character) throws {
+        try StringUtil.checkChar(char: char, mask: TimeAndSale.tteMask, name: "tradeThroughExempt")
+        if let value = char.unicodeScalars.first?.value {
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: TimeAndSale.tteMask,
+                                          shift: TimeAndSale.tteShift,
+                                          bits: Int(value)))
+        }
+    }
+
+    /// Gets or sets aggressor side of this option sale event.
+    public var aggressorSide: Side {
+        get {
+            Side.valueOf(Int(BitUtil.getBits(flags: Int(flags),
+                                             mask: TimeAndSale.sideMask,
+                                             shift: TimeAndSale.sideShift)))
+        }
+        set {
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: TimeAndSale.sideMask,
+                                          shift: TimeAndSale.sideShift,
+                                          bits: newValue.rawValue))
+        }
+    }
+
+    /// Gets or sets a value indicating whether this event represents a spread leg.
+    public var isSpreadLeg: Bool {
+        get {
+            (flags & Int32(TimeAndSale.spreadLeg)) != 0
+        }
+        set {
+            flags = newValue ? (flags | Int32(TimeAndSale.spreadLeg)) : (flags & ~Int32(TimeAndSale.spreadLeg))
+        }
+    }
+
+    /// Gets or sets a value indicating whether this event represents an extended trading hours sale.
+    public var isExtendedTradingHours: Bool {
+        get {
+            (flags & Int32(TimeAndSale.eth)) != 0
+        }
+        set {
+            flags = newValue ? (flags | Int32(TimeAndSale.eth)) : (flags & ~Int32(TimeAndSale.eth))
+        }
+    }
+
+    /// Gets or sets a value indicating whether this event represents a valid intraday tick.
+    ///
+    /// Note, that a correction for a previously distributed valid tick represents a new valid tick itself,
+    /// but a cancellation of a previous valid tick does not.
+    public var isValidTick: Bool {
+        get {
+            (flags & Int32(TimeAndSale.validTick)) != 0
+        }
+        set {
+            flags = newValue ? (flags | Int32(TimeAndSale.validTick)) : flags & ~Int32(TimeAndSale.validTick)
+        }
+    }
+
+    /// Gets or sets type of this option sale event.
+    public var optionSaleType: TimeAndSaleType {
+        get {
+            TimeAndSaleType.valueOf(BitUtil.getBits(flags: Int(flags),
+                                                    mask: TimeAndSale.typeMask,
+                                                    shift: TimeAndSale.typeShift))
+        }
+        set {
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: TimeAndSale.typeMask,
+                                          shift: TimeAndSale.typeShift,
+                                          bits: newValue.rawValue))
+        }
+    }
+
+    /// Gets a value indicating whether this is a new event (not cancellation or correction).
+    ///
+    /// It is true for newly created option sale event.
+    public var isNew: Bool {
+        optionSaleType == .new
+    }
+
+    /// Gets a value indicating whether this is a correction of a previous event.
+    ///
+    /// It is false for newly created option sale event.
+    /// true if this is a correction of a previous event.
+    public var isCorrection: Bool {
+        optionSaleType == .correction
+    }
+
+    /// Gets a value indicating whether this is a cancellation of a previous event.
+    ///
+    /// It is false for newly created option sale event.
+    /// true if this is a cancellation of a previous event.
+    public var isCancel: Bool {
+        optionSaleType == .cancel
+    }
+
+    /// Returns string representation of this time and sale event.
+    public func toString() -> String {
+        return """
+OptionSale{\(eventSymbol), \
+eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
+eventFlags=0x\(String(format: "%02X", eventFlags)), \
+index=0x\(String(format: "%02X", index)), \
+time=\(TimeUtil.toLocalDateString(millis: time)), \
+timeNanoPart=\(timeNanoPart), \
+sequence=\(getSequence()), \
+exchange=\(StringUtil.encodeChar(char: exchangeCode)), \
+price=\(price), \
+size=\(size), \
+bid=\(bidPrice), \
+ask=\(askPrice), \
+ESC='\(exchangeSaleConditions ?? "null")', \
+TTE=\(StringUtil.encodeChar(char: Int16(getTradeThroughExempt().unicodeScalars.first?.value ?? 0))), \
+side=\(aggressorSide), \
+spread=\(isSpreadLeg), \
+ETH=\(isExtendedTradingHours), \
+validTick=\(isValidTick), \
+type=\(optionSaleType), \
+underlyingPrice=\(underlyingPrice), \
+volatility=\(volatility), \
+delta=\(delta), \
+optionSymbol='\(optionSymbol)'\
+}
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Order.swift b/DXFeedFramework/Events/Market/Order.swift
new file mode 100644
index 000000000..dc253d050
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Order.swift
@@ -0,0 +1,33 @@
+//
+//  Order.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 11.10.23.
+//
+
+import Foundation
+/// Order event is a snapshot for a full available market depth for a symbol.
+///
+/// The collection of order events of a symbol represents the most recent information
+/// that is available about orders on the market at any given moment of time.
+/// Order events give information on several levels of details, called scopes - see ``Scope``.
+/// Scope of an order is available via ``OrderBase.Scope``property.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/market/Order.html)
+public class Order: OrderBase {
+    public override var type: EventCode {
+        return .order
+    }
+    /// Gets or sets market maker or other aggregate identifier of this order.
+    /// This value is defined for ``Scope/aggregate`` and ``Scope/order`` orders.
+    public var marketMaker: String?
+
+    /// Returns string representation of this candle event.
+    public override func toString() -> String {
+        return
+"""
+Order{\(baseFieldsToString()), \
+marketMaker=\(marketMaker ?? "null")}
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Series.swift b/DXFeedFramework/Events/Market/Series.swift
new file mode 100644
index 000000000..d328e35ef
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Series.swift
@@ -0,0 +1,127 @@
+//
+//  Series.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+
+/// Series event is a snapshot of computed values that are available for all option series for
+/// a given underlying symbol based on the option prices on the market.
+///
+/// It represents the most recent information that is available about the corresponding values on
+/// the market at any given moment of time.
+///
+/// (For more details see)[https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/option/Series.html]
+public class Series: MarketEvent, IIndexedEvent {
+    public var type: EventCode = .series
+
+    public var eventSource: IndexedEventSource = .defaultSource
+
+    public var eventFlags: Int32 = 0
+
+    public var index: Long = 0
+
+    public var eventSymbol: String
+
+    public var eventTime: Int64 = 0
+
+    /*
+     * EventFlags property has several significant bits that are packed into an integer in the following way:
+     *    31..7    6    5    4    3    2    1    0
+     * \---------+----+----+----+----+----+----+----+
+     * |         | SM |    | SS | SE | SB | RE | TX |
+     * \---------+----+----+----+----+----+----+----+
+     */
+
+    /// Gets or sets time and sequence of this series packaged into single long value.
+    ///
+    /// This method is intended for efficient series time priority comparison.
+    /// **Do not use this method directly**
+    /// 
+    /// Change ``time`` and/or  ``setSequence(_:)``
+    public internal(set) var timeSequence: Long = 0
+    /// Gets or sets day id of expiration.
+    public var expiration: Int32 = 0
+    /// Gets or sets implied volatility index for this series based on VIX methodology.
+    public var volatility: Double = .nan
+    /// Gets or sets call options traded volume for a day.
+    public var callVolume: Double = .nan
+    /// Gets or sets put options traded volume for a day.
+    public var putVolume: Double = .nan
+    /// Gets or sets ratio of put options traded volume to call options traded volume for a day.
+    public var putCallRatio: Double = .nan
+    /// Gets or sets implied forward price for this option series.
+    public var forwardPrice: Double = .nan
+    /// Gets or sets implied simple dividend return of the corresponding option series.
+    public var dividend: Double = .nan
+    /// Gets or sets implied simple interest return of the corresponding option series.
+    public var interest: Double = .nan
+
+    public init(_ eventSymbol: String) {
+        self.eventSymbol = eventSymbol
+    }
+}
+
+extension Series {
+    /// Gets or sets timestamp of the event in milliseconds.
+    /// Time is measured in milliseconds between the current time and midnight, January 1, 1970 UTC.
+    public var time: Long {
+        get {
+            ((timeSequence >> 32) * 1000) + ((timeSequence >> 22) & 0x3ff)
+        }
+        set {
+            timeSequence = Long(TimeUtil.getSecondsFromTime(newValue) << 32) |
+            (Long(TimeUtil.getMillisFromTime(newValue)) << 22) |
+            Int64(getSequence())
+        }
+    }
+    /// Gets sequence number of this event to distinguish events that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    public func getSequence() -> Int {
+        return Int(timeSequence) & Int(MarketEventConst.maxSequence)
+    }
+    /// Sets sequence number of this event to distinguish quotes that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func setSequence(_ sequence: Int) throws {
+        if sequence < 0 || sequence > MarketEventConst.maxSequence {
+            throw ArgumentException.exception(
+                "Sequence(\(sequence) is < 0 or > MaxSequence(\(MarketEventConst.maxSequence)"
+            )
+        }
+        timeSequence = Long(timeSequence & ~Long(MarketEventConst.maxSequence)) | Long(sequence)
+    }
+
+    /// Gets options traded volume for a day.
+    public func getOptionVolume() -> Double {
+        if putVolume.isNaN {
+            return callVolume
+        }
+        return callVolume.isNaN ? putVolume : putVolume + putVolume
+    }
+
+    /// Returns string representation of this candle event.
+    public func toString() -> String {
+        return
+"""
+Series{\(eventSymbol), \
+eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
+eventFlags=0x\(String(format: "%02X", eventFlags)), \
+index=0x\(String(format: "%02X", index)), \
+time=\(TimeUtil.toLocalDateString(millis: time)), \
+sequence=\(self.getSequence()), \
+expiration=\(DayUtil.getYearMonthDayByDayId(Int(expiration))), \
+volatility=\(volatility), \
+callVolume=\(callVolume), \
+putVolume=\(putVolume), \
+putCallRatio=\(putCallRatio), \
+forwardPrice=\(forwardPrice), \
+dividend=\(dividend), \
+interest=\(interest)
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/SpreadOrder.swift b/DXFeedFramework/Events/Market/SpreadOrder.swift
new file mode 100644
index 000000000..9cadfcd4e
--- /dev/null
+++ b/DXFeedFramework/Events/Market/SpreadOrder.swift
@@ -0,0 +1,43 @@
+//
+//  SpreadOrder.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 11.10.23.
+//
+
+import Foundation
+
+/// Spread order event is a snapshot for a full available market depth for all spreads
+/// on a given underlying symbol.
+///
+/// The collection of spread order events of a symbol
+/// represents the most recent information that is available about spread orders on
+/// the market at any given moment of time.
+///
+/// Spread order is similar to a regular ``Order``, but it has a
+/// ``SpreadSymbol`` property that contains the symbol
+/// of the actual spread that is being represented by spread order object.
+/// ``MarketEvent.EventSymbol`` property contains the underlying symbol
+/// that was used in subscription.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/market/SpreadOrder.html)
+public class SpreadOrder: OrderBase {
+    public override var type: EventCode {
+        return .spreadOrder
+    }
+    /// Gets or sets spread symbol of this event.
+    public var spreadSymbol: String?
+
+    public override init(_ eventSymbol: String) {
+        super.init(eventSymbol)
+    }
+
+    /// Returns string representation of this candle event.
+    public override func toString() -> String {
+        return
+"""
+SpreadOrder{\(baseFieldsToString()), \
+spreadSymbol=\(spreadSymbol ?? "null")}
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/Summary.swift b/DXFeedFramework/Events/Market/Summary.swift
new file mode 100644
index 000000000..52602e449
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Summary.swift
@@ -0,0 +1,137 @@
+//
+//  Summary.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+
+/// Summary information snapshot about the trading session including session highs, lows, etc.
+///
+/// It represents the most recent information that is available about the trading session in
+/// the market at any given moment of time.
+///
+/// This event is implemented on top of QDS records 
+///  for regional exchange trading session summaries.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/market/Summary.html)
+public class Summary: MarketEvent, ILastingEvent, CustomStringConvertible {
+    public let type: EventCode = .summary
+    public var eventSymbol: String
+    public var eventTime: Int64 = 0
+
+    /*
+     * Flags property has several significant bits that are packed into an integer in the following way:
+     *   31..4     3    2    1    0
+     *) \--------+----+----+----+----+
+     * |        |  Close  |PrevClose|
+     *) \--------+----+----+----+----+
+     */
+
+    // PRICE_TYPE values are taken from PriceType enum.
+    static let dayClosePriceTypeMask: Int32 = 3
+    static let dayClosePriceTypeShift: Int32 = 2
+
+    // priceType values are taken from pricetype enum.
+    static let prevDayClosePriceTypeMask: Int32 = 3
+    static let prevDayClosePriceTypeShift: Int32 = 0
+
+    /// Gets or sets identifier of the day that this summary represents.
+    /// Identifier of the day is the number of days passed since January 1, 1970.
+    public var dayId: Int32 = 0
+    /// Gets or sets  the first (open) price for the day.
+    public var dayOpenPrice: Double = .nan
+    /// Gets or sets the maximal (high) price for the day.
+    public var dayHighPrice: Double = .nan
+    /// Gets or sets the minimal (low) price for the day.
+    public var dayLowPrice: Double = .nan
+    /// Gets or sets he last (close) price for the day.
+    public var dayClosePrice: Double = .nan
+    /// Gets or sets  identifier of the previous day that this summary represents.
+    /// Identifier of the day is the number of days passed since January 1, 1970.
+    public var prevDayId: Int32 = 0
+    /// Gets or sets the price type of the last (close) price for the day.
+    public var prevDayClosePrice: Double = .nan
+    /// Gets or sets total volume traded for the previous day.
+    public var prevDayVolume: Double = .nan
+    /// Gets or sets open interest of the symbol as the number of open contracts.
+    public var openInterest: Long = 0
+    /// Gets or sets implementation-specific flags.
+    var flags: Int32 = 0
+
+    /// Initializes a new instance of the ``Summary`` class.
+    public init(_ eventSymbol: String) {
+        self.eventSymbol = eventSymbol
+    }
+
+    public var description: String {
+"""
+DXFG_SUMMARY_T \
+eventSymbol: \(eventSymbol) \
+eventTime: \(eventTime) \
+dayId: \(dayId), \
+dayOpenPrice: \(dayOpenPrice), \
+dayHighPrice: \(dayHighPrice), \
+dayLowPrice: \(dayLowPrice), \
+dayClosePrice: \(dayClosePrice), \
+prevDayId: \(prevDayId), \
+prevDayClosePrice: \(prevDayClosePrice), \
+prevDayVolume: \(prevDayVolume), \
+openInterest: \(openInterest), \
+flags: \(flags)
+"""
+    }
+}
+
+extension Summary {
+    /// Gets or sets the price type of the last (close) price for the day.
+    public var dayClosePriceType: PriceType {
+        get {
+            PriceType.valueOf(Int(BitUtil.getBits(flags: flags,
+                                                  mask: Summary.dayClosePriceTypeMask,
+                                                  shift: Summary.dayClosePriceTypeShift)))
+        }
+        set {
+            flags = BitUtil.setBits(flags: flags,
+                                    mask: Summary.dayClosePriceTypeMask,
+                                    shift: Summary.dayClosePriceTypeShift,
+                                    bits: Int32(newValue.rawValue.code))
+        }
+    }
+    /// Gets or sets the price type of the last (close) price for the previous day.
+    public var prevDayClosePriceType: PriceType {
+        get {
+            PriceType.valueOf(Int(BitUtil.getBits(flags: flags,
+                                                  mask: Summary.prevDayClosePriceTypeMask,
+                                                  shift: Summary.prevDayClosePriceTypeShift)))
+        }
+        set {
+            flags = BitUtil.setBits(flags: flags,
+                                    mask: Summary.prevDayClosePriceTypeMask,
+                                    shift: Summary.prevDayClosePriceTypeShift,
+                                    bits: Int32(newValue.rawValue.code))
+        }
+    }
+
+    /// Returns string representation of this summary fields.
+    public func toString() -> String {
+        return
+"""
+Summary{\(eventSymbol), \
+eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
+day=\(DayUtil.getYearMonthDayByDayId(dayId)), \
+dayOpen=\(dayOpenPrice), \
+dayHigh=\(dayHighPrice), \
+dayLow=\(dayLowPrice), \
+dayClose=\(dayClosePrice), \
+dayCloseType=\(dayClosePriceType), \
+prevDay=\(DayUtil.getYearMonthDayByDayId(prevDayId)), \
+prevDayClose=\(prevDayClosePrice), \
+prevDayCloseType=\(prevDayClosePriceType), \
+prevDayVolume=\(prevDayVolume), \
+openInterest=\(openInterest), \
+}
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/TheoPrice.swift b/DXFeedFramework/Events/Market/TheoPrice.swift
new file mode 100644
index 000000000..f13d0dea8
--- /dev/null
+++ b/DXFeedFramework/Events/Market/TheoPrice.swift
@@ -0,0 +1,126 @@
+//
+//  TheoPrice.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+
+/// Theo price is a snapshot of the theoretical option price computation that is
+/// periodically performed by http://www.devexperts.com/en/products/price.html
+///
+/// model-free computation.
+/// It represents the most recent information that is available about the corresponding
+/// values at any given moment of time.
+/// The values include first and second order derivative of the price curve by price, so that
+/// the real-time theoretical option price can be estimated on real-time changes of the underlying
+/// price in the vicinity.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/option/TheoPrice.html)
+public class TheoPrice: MarketEvent, ITimeSeriesEvent, ILastingEvent, CustomStringConvertible {
+    public var type: EventCode = .theoPrice
+
+    public var eventSymbol: String
+
+    public var eventTime: Int64 = 0
+
+    public var eventSource: IndexedEventSource = .defaultSource
+
+    public var eventFlags: Int32 = 0
+
+    public var index: Long = 0
+
+    /*
+     * EventFlags property has several significant bits that are packed into an integer in the following way:
+     *    31..7    6    5    4    3    2    1    0
+     * +---------+----+----+----+----+----+----+----+
+     * |         | SM |    | SS | SE | SB | RE | TX |
+     * +---------+----+----+----+----+----+----+----+
+     */
+
+    /// Gets or sets theoretical option price.
+    public var price: Double = .nan
+    /// Gets or sets underlying price at the time of theo price computation.
+    public var underlyingPrice: Double = .nan
+    /// Gets or sets delta of the theoretical price.
+    /// Delta is the first derivative of an option price by an underlying price.
+    public var delta: Double = .nan
+    /// Gets or sets gamma of the theoretical price.
+    /// Gamma is the second derivative of an option price by an underlying price.
+    public var gamma: Double = .nan
+    /// Gets or sets implied simple dividend return of the corresponding option series.
+    public var dividend: Double = .nan
+    /// Gets or sets implied simple interest return of the corresponding option series.
+    public var interest: Double = .nan
+
+    public init(_ eventSymbol: String) {
+        self.eventSymbol = eventSymbol
+    }
+
+    public var description: String {
+"""
+DXFG_THEO_PRICE_T \
+eventSymbol: \(eventSymbol) \
+eventTime: \(eventTime) \
+eventFlags: \(eventFlags), \
+index: \(index), \
+price: \(price), \
+underlyingPrice: \(underlyingPrice), \
+delta: \(delta), \
+gamma: \(gamma), \
+dividend: \(dividend), \
+interest: \(interest)
+"""
+        }
+}
+
+extension TheoPrice {
+    /// Gets or sets timestamp of the event in milliseconds.
+    /// Time is measured in milliseconds between the current time and midnight, January 1, 1970 UTC.
+    public var time: Long {
+        get {
+            ((index >> 32) * 1000) + ((index >> 22) & 0x3ff)
+        }
+        set {
+            index = Long(TimeUtil.getSecondsFromTime(newValue) << 32) |
+            (Long(TimeUtil.getMillisFromTime(newValue)) << 22) |
+            Int64(getSequence())
+        }
+    }
+    /// Gets sequence number of this quote to distinguish events that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    public func getSequence() -> Int {
+        return Int(index) & Int(MarketEventConst.maxSequence)
+    }
+    /// Sets sequence number of this quote to distinguish quotes that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func setSequence(_ sequence: Int) throws {
+        if sequence < 0 || sequence > MarketEventConst.maxSequence {
+            throw ArgumentException.exception(
+                "Sequence(\(sequence) is < 0 or > MaxSequence(\(MarketEventConst.maxSequence)"
+            )
+        }
+        index = Long(index & ~Long(MarketEventConst.maxSequence)) | Long(sequence)
+    }
+    /// Returns string representation of this order fields.
+    public func toString() -> String {
+        return """
+TheoPrice{\(eventSymbol) \
+eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
+eventFlags=0x\(String(format: "%02X", eventFlags)), \
+time=\(TimeUtil.toLocalDateString(millis: time)), \
+sequence=\(self.getSequence()), \
+price=\(price) \
+underlyingPrice=\(underlyingPrice), \
+delta=\(delta), \
+gamma=\(gamma), \
+dividend=\(dividend), \
+interest=\(interest), \
+}
+"""
+    }
+}
diff --git a/DXFeedFramework/Events/Market/TimeAndSale.swift b/DXFeedFramework/Events/Market/TimeAndSale.swift
index 6f0da29f7..8c7d13f3d 100644
--- a/DXFeedFramework/Events/Market/TimeAndSale.swift
+++ b/DXFeedFramework/Events/Market/TimeAndSale.swift
@@ -51,20 +51,20 @@ public class TimeAndSale: MarketEvent, ITimeSeriesEvent, CustomStringConvertible
     public var seller: String?
 
     // TTE (TradeThroughExempt) values are ASCII chars in [0, 255].
-    internal let tteMask = 0xff
-    internal let tteShift = 8
+    internal static let tteMask = 0xff
+    internal static let tteShift = 8
 
     // SIDE values are taken from Side enum.
-    internal let sideMask = 3
-    internal let sideShift = 5
+    internal static let sideMask = 3
+    internal static let sideShift = 5
 
-    internal let spreadLeg = 1 << 4
-    internal let eth = 1 << 3
-    internal let validTick = 1 << 2
+    internal static let spreadLeg = 1 << 4
+    internal static let eth = 1 << 3
+    internal static let validTick = 1 << 2
 
     // TYPE values are taken from TimeAndSaleType enum.
-    internal let typeMask = 3
-    internal let typeShift = 0
+    internal static let typeMask = 3
+    internal static let typeShift = 0
 
     /// Override var from ``IIndexedEvent``
     public var eventSource = IndexedEventSource.defaultSource
@@ -148,45 +148,55 @@ extension TimeAndSale {
     }
     /// Gets  TradeThroughExempt flag of this time and sale event.
     public func getTradeThroughExempt() -> Character {
-        Character(BitUtil.getBits(flags: Int(flags), mask: tteMask, shift: tteShift))
+        Character(BitUtil.getBits(flags: Int(flags),
+                                  mask: TimeAndSale.tteMask,
+                                  shift: TimeAndSale.tteShift))
     }
     /// Sets  TradeThroughExempt flag of this time and sale event.
     ///
     /// - Throws: ``ArgumentException/exception(_:)``
     public func setTradeThroughExempt(_ char: Character) throws {
-        try StringUtil.checkChar(char: char, mask: tteMask, name: "tradeThroughExempt")
+        try StringUtil.checkChar(char: char, mask: TimeAndSale.tteMask, name: "tradeThroughExempt")
         if let value = char.unicodeScalars.first?.value {
-            flags = Int32(BitUtil.setBits(flags: Int(flags), mask: tteMask, shift: tteShift, bits: Int(value)))
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: TimeAndSale.tteMask,
+                                          shift: TimeAndSale.tteShift,
+                                          bits: Int(value)))
         }
     }
 
     /// Gets or sets aggressor side of this time and sale event.
     public var aggressorSide: Side {
         get {
-            Side.valueOf(Int(BitUtil.getBits(flags: Int(flags), mask: sideMask, shift: sideShift)))
+            Side.valueOf(Int(BitUtil.getBits(flags: Int(flags),
+                                             mask: TimeAndSale.sideMask,
+                                             shift: TimeAndSale.sideShift)))
         }
         set {
-            flags = Int32(BitUtil.setBits(flags: Int(flags), mask: sideMask, shift: sideShift, bits: newValue.rawValue))
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: TimeAndSale.sideMask,
+                                          shift: TimeAndSale.sideShift,
+                                          bits: newValue.rawValue))
         }
     }
 
     /// Gets or sets a value indicating whether this event represents a spread leg.
     public var isSpreadLeg: Bool {
         get {
-            (flags & Int32(spreadLeg)) != 0
+            (flags & Int32(TimeAndSale.spreadLeg)) != 0
         }
         set {
-            flags = newValue ? (flags | Int32(spreadLeg)) : (flags & ~Int32(spreadLeg))
+            flags = newValue ? (flags | Int32(TimeAndSale.spreadLeg)) : (flags & ~Int32(TimeAndSale.spreadLeg))
         }
     }
 
     /// Gets or sets a value indicating whether this event represents an extended trading hours sale.
     public var isExtendedTradingHours: Bool {
         get {
-            (flags & Int32(eth)) != 0
+            (flags & Int32(TimeAndSale.eth)) != 0
         }
         set {
-            flags = newValue ? (flags | Int32(eth)) : (flags & ~Int32(eth))
+            flags = newValue ? (flags | Int32(TimeAndSale.eth)) : (flags & ~Int32(TimeAndSale.eth))
         }
     }
 
@@ -196,20 +206,25 @@ extension TimeAndSale {
     /// but a cancellation of a previous valid tick does not.
     public var isValidTick: Bool {
         get {
-            (flags & Int32(validTick)) != 0
+            (flags & Int32(TimeAndSale.validTick)) != 0
         }
         set {
-            flags = newValue ? (flags | Int32(validTick)) : flags & ~Int32(validTick)
+            flags = newValue ? (flags | Int32(TimeAndSale.validTick)) : flags & ~Int32(TimeAndSale.validTick)
         }
     }
 
     /// Gets or sets type of this time and sale event.
     public var timeAndSaleType: TimeAndSaleType {
         get {
-            TimeAndSaleType.valueOf(BitUtil.getBits(flags: Int(flags), mask: typeMask, shift: typeShift))
+            TimeAndSaleType.valueOf(BitUtil.getBits(flags: Int(flags),
+                                                    mask: TimeAndSale.typeMask,
+                                                    shift: TimeAndSale.typeShift))
         }
         set {
-            flags = Int32(BitUtil.setBits(flags: Int(flags), mask: typeMask, shift: typeShift, bits: newValue.rawValue))
+            flags = Int32(BitUtil.setBits(flags: Int(flags),
+                                          mask: TimeAndSale.typeMask,
+                                          shift: TimeAndSale.typeShift,
+                                          bits: newValue.rawValue))
         }
     }
 
@@ -239,7 +254,7 @@ extension TimeAndSale {
     /// Returns string representation of this time and sale event.
     public func toString() -> String {
         return """
-TimeAndSale{"\(eventSymbol), \
+TimeAndSale{\(eventSymbol), \
 eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
 eventFlags=0x\(String(format: "%02X", eventFlags)), \
 time=\(TimeUtil.toLocalDateString(millis: time)), \
@@ -256,7 +271,8 @@ side=\(aggressorSide), \
 spread=\(isSpreadLeg), \
 ETH=\(isExtendedTradingHours), \
 validTick=\(isValidTick), \
-type=\(timeAndSaleType)\(buyer == nil ? "" : ", buyer='\(buyer ?? "null")'")\
+type=\(timeAndSaleType)\
+\(buyer == nil ? "" : ", buyer='\(buyer ?? "null")'")\
 \(seller == nil ? "" : ", seller='\(seller ?? "null")'")\
 }
 """
diff --git a/DXFeedFramework/Events/Market/Underlying.swift b/DXFeedFramework/Events/Market/Underlying.swift
new file mode 100644
index 000000000..fffa659ae
--- /dev/null
+++ b/DXFeedFramework/Events/Market/Underlying.swift
@@ -0,0 +1,126 @@
+//
+//  Underlying.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+
+/// Underlying event is a snapshot of computed values that are available for an option underlying
+/// symbol based on the option prices on the market.
+///
+/// It represents the most recent information that is available about the corresponding values on
+/// the market at any given moment of time.
+///
+/// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/option/Underlying.html)
+public class Underlying: MarketEvent, ITimeSeriesEvent, ILastingEvent, CustomStringConvertible {
+    public var type: EventCode = .underlying
+
+    public var eventSymbol: String
+
+    public var eventTime: Int64 = 0
+
+    public var eventSource: IndexedEventSource = .defaultSource
+
+    public var eventFlags: Int32 = 0
+
+    public var index: Long = 0
+
+    /*
+     * EventFlags property has several significant bits that are packed into an integer in the following way:
+     *    31..7    6    5    4    3    2    1    0
+     * +---------+----+----+----+----+----+----+----+
+     * |         | SM |    | SS | SE | SB | RE | TX |
+     * +---------+----+----+----+----+----+----+----+
+     */
+
+    /// Gets or sets 30-day implied volatility for this underlying based on VIX methodology.
+    public var volatility: Double = .nan
+    /// Gets or sets front month implied volatility for this underlying based on VIX methodology.
+    public var frontVolatility: Double = .nan
+    /// Gets or sets back month implied volatility for this underlying based on VIX methodology.
+    public var backVolatility: Double = .nan
+    /// Gets or sets call options traded volume for a day.
+    public var callVolume: Double = .nan
+    /// Gets or sets put options traded volume for a day.
+    public var putVolume: Double = .nan
+    /// Gets or sets ratio of put options traded volume to call options traded volume for a day.
+    public var putCallRatio: Double = .nan
+
+    public init(_ eventSymbol: String) {
+        self.eventSymbol = eventSymbol
+    }
+
+    public var description: String {
+"""
+DXFG_UNDERLYING_T \
+eventSymbol: \(eventSymbol) \
+eventTime: \(eventTime) \
+eventFlags: \(eventFlags), \
+index: \(index), \
+volatility: \(volatility), \
+frontVolatility: \(frontVolatility), \
+backVolatility: \(backVolatility), \
+callVolume: \(callVolume), \
+putVolume: \(putVolume), \
+putCallRatio: \(putCallRatio)
+"""
+        }
+}
+
+extension Underlying {
+    /// Gets or sets timestamp of the event in milliseconds.
+    /// Time is measured in milliseconds between the current time and midnight, January 1, 1970 UTC.
+    public var time: Long {
+        get {
+            ((index >> 32) * 1000) + ((index >> 22) & 0x3ff)
+        }
+        set {
+            index = Long(TimeUtil.getSecondsFromTime(newValue) << 32) |
+            (Long(TimeUtil.getMillisFromTime(newValue)) << 22) |
+            Int64(getSequence())
+        }
+    }
+    /// Gets options traded volume for a day.
+    public var optionVolume: Double {
+        if putVolume.isNaN {
+            return callVolume
+        }
+        return callVolume.isNaN ? putVolume : putVolume + callVolume
+    }
+    /// Gets sequence number of this quote to distinguish events that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    public func getSequence() -> Int {
+        return Int(index) & Int(MarketEventConst.maxSequence)
+    }
+    /// Sets sequence number of this quote to distinguish quotes that have the same ``time``.
+    /// This sequence number does not have to be unique and
+    /// does not need to be sequential. Sequence can range from 0 to ``MarketEventConst/maxSequence``.
+    /// - Throws: ``ArgumentException/exception(_:)``
+    public func setSequence(_ sequence: Int) throws {
+        if sequence < 0 || sequence > MarketEventConst.maxSequence {
+            throw ArgumentException.exception(
+                "Sequence(\(sequence) is < 0 or > MaxSequence(\(MarketEventConst.maxSequence)"
+            )
+        }
+        index = Long(index & ~Long(MarketEventConst.maxSequence)) | Long(sequence)
+    }
+    /// Returns string representation of this underlying fields.
+    public func toString() -> String {
+        return """
+Underlying{"\(eventSymbol) \
+eventTime=\(TimeUtil.toLocalDateString(millis: eventTime)), \
+eventFlags=0x\(String(format: "%02X", eventFlags)), \
+time=\(TimeUtil.toLocalDateString(millis: time)), \
+sequence=\(self.getSequence()), \
+volatility=\(volatility), \
+frontVolatility=\(frontVolatility), \
+backVolatility=\(backVolatility), \
+callVolume=\(callVolume), \
+putVolume=\(putVolume), \
+putCallRatio=\(putCallRatio)}
+"""
+    }
+}
diff --git a/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift b/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift
index 608fa2a4e..d61504b73 100644
--- a/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift
+++ b/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift
@@ -12,7 +12,7 @@ import Foundation
 class NativeEndpoint {
     private class WeakListener: WeakBox<EndpointListener> { }
     private static let listeners = ConcurrentArray<WeakListener>()
-    
+
     let endpoint: UnsafeMutablePointer<dxfg_endpoint_t>!
     var listener: UnsafeMutablePointer<dxfg_endpoint_state_change_listener_t>?
 
diff --git a/DXFeedFramework/Native/Events/EventMapper.swift b/DXFeedFramework/Native/Events/EventMapper.swift
index 5cb4095d6..8c8aec782 100644
--- a/DXFeedFramework/Native/Events/EventMapper.swift
+++ b/DXFeedFramework/Native/Events/EventMapper.swift
@@ -18,10 +18,19 @@ class EventMapper: Mapper {
     }
 
     private let mappers: [EventCode: any Mapper] = [.quote: QuoteMapper(),
-                                                .timeAndSale: TimeAndSaleMapper(),
-                                                .profile: ProfileMapper(),
-                                                .trade: TradeMapper(),
-                                                .candle: CandleMapper()]
+                                                    .timeAndSale: TimeAndSaleMapper(),
+                                                    .profile: ProfileMapper(),
+                                                    .trade: TradeMapper(),
+                                                    .candle: CandleMapper(),
+                                                    .summary: SummaryMapper(),
+                                                    .greeks: GreeksMapper(),
+                                                    .underlying: UnderlyingMapper(),
+                                                    .theoPrice: TheoPriceMapper(),
+                                                    .order: OrderMapper(),
+                                                    .analyticOrder: AnalyticOrderMapper(),
+                                                    .spreadOrder: SpreadOrderMapper(),
+                                                    .series: SeriesMapper(),
+                                                    .optionSale: OptionSaleMapper()]
 
     func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) throws -> MarketEvent? {
         let code = try EnumUtil.valueOf(value: EventCode.convert(native.pointee.clazz))
@@ -34,7 +43,8 @@ class EventMapper: Mapper {
     func toNative(event: MarketEvent) throws -> UnsafeMutablePointer<dxfg_event_type_t>? {
         let code = event.type
         if let mapper = mappers[code] {
-            return try mapper.toNative(event: event)
+            let native = try mapper.toNative(event: event)
+            return native
         }
         return nil
     }
diff --git a/DXFeedFramework/Native/Events/Markets/AnalyticOrder+Ext.swift b/DXFeedFramework/Native/Events/Markets/AnalyticOrder+Ext.swift
new file mode 100644
index 000000000..429ba783f
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/AnalyticOrder+Ext.swift
@@ -0,0 +1,37 @@
+//
+//  AnalyticOrder+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension AnalyticOrder {
+    convenience init(native: dxfg_analytic_order_t) {
+        self.init(String(pointee: native.order_base.order_base.market_event.event_symbol))
+
+        self.eventTime = native.order_base.order_base.market_event.event_time
+        self.eventFlags = native.order_base.order_base.event_flags
+        self.index = native.order_base.order_base.index
+        self.timeSequence = native.order_base.order_base.time_sequence
+        self.timeNanoPart = native.order_base.order_base.time_nano_part
+        self.actionTime = native.order_base.order_base.action_time
+        self.orderId = native.order_base.order_base.order_id
+        self.auxOrderId = native.order_base.order_base.aux_order_id
+        self.price = native.order_base.order_base.price
+        self.size = native.order_base.order_base.size
+        self.executedSize = native.order_base.order_base.executed_size
+        self.count = native.order_base.order_base.count
+        self.flags = native.order_base.order_base.flags
+        self.tradeId = native.order_base.order_base.trade_id
+        self.tradePrice = native.order_base.order_base.trade_price
+        self.tradeSize = native.order_base.order_base.trade_size
+
+        self.icebergPeakSize = native.iceberg_peak_size
+        self.icebergHiddenSize = native.iceberg_hidden_size
+        self.icebergExecutedSize = native.iceberg_executed_size
+        self.icebergFlags = native.iceberg_flags
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/AnalyticOrderMapper.swift b/DXFeedFramework/Native/Events/Markets/AnalyticOrderMapper.swift
new file mode 100644
index 000000000..54f3d0b8d
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/AnalyticOrderMapper.swift
@@ -0,0 +1,57 @@
+//
+//  AnalyticOrderMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class AnalyticOrderMapper: Mapper {
+    let type = dxfg_analytic_order_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return AnalyticOrder(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<TypeAlias>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.order_base.order_base.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.order_base.order_base.market_event.event_time = event.eventTime
+
+        let order = event.analyticOrder
+
+        pointee.order_base.order_base.market_event.event_time = order.eventTime
+        pointee.order_base.order_base.event_flags = order.eventFlags
+        pointee.order_base.order_base.index = order.index
+        pointee.order_base.order_base.time_sequence = order.timeSequence
+        pointee.order_base.order_base.time_nano_part = order.timeNanoPart
+        pointee.order_base.order_base.action_time = order.actionTime
+        pointee.order_base.order_base.order_id = order.orderId
+        pointee.order_base.order_base.aux_order_id = order.auxOrderId
+        pointee.order_base.order_base.price = order.price
+        pointee.order_base.order_base.size = order.size
+        pointee.order_base.order_base.executed_size = order.executedSize
+        pointee.order_base.order_base.count = order.count
+        pointee.order_base.order_base.flags = order.flags
+        pointee.order_base.order_base.trade_id = order.tradeId
+        pointee.order_base.order_base.trade_price = order.tradePrice
+        pointee.order_base.order_base.trade_size = order.tradeSize
+
+        pointee.iceberg_peak_size = order.icebergPeakSize
+        pointee.iceberg_hidden_size = order.icebergHiddenSize
+        pointee.iceberg_executed_size = order.icebergExecutedSize
+        pointee.iceberg_flags = order.icebergFlags
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_ANALYTIC_ORDER
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/CandleMapper.swift b/DXFeedFramework/Native/Events/Markets/CandleMapper.swift
index 150c4a176..91e68bd9c 100644
--- a/DXFeedFramework/Native/Events/Markets/CandleMapper.swift
+++ b/DXFeedFramework/Native/Events/Markets/CandleMapper.swift
@@ -20,8 +20,10 @@ class CandleMapper: Mapper {
     func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
         let pointer = UnsafeMutablePointer<dxfg_candle_t>.allocate(capacity: 1)
         var pointee = pointer.pointee
-        let candle = event.candle
+        pointee.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.event_time = event.eventTime
 
+        let candle = event.candle
         pointee.event_flags = candle.eventFlags
         pointee.index = candle.index
         pointee.count = candle.count
diff --git a/DXFeedFramework/Native/Events/Markets/Greeks+Ext.swift b/DXFeedFramework/Native/Events/Markets/Greeks+Ext.swift
new file mode 100644
index 000000000..f9d7b4115
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/Greeks+Ext.swift
@@ -0,0 +1,25 @@
+//
+//  Greeks+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension Greeks {
+    convenience init(native: dxfg_greeks_t) {
+        self.init(String(pointee: native.market_event.event_symbol))
+        self.eventTime = native.market_event.event_time
+        self.eventFlags = native.event_flags
+        self.index = native.index
+        self.price = native.price
+        self.volatility = native.volatility
+        self.delta = native.delta
+        self.gamma = native.gamma
+        self.theta = native.theta
+        self.rho = native.rho
+        self.vega = native.vega
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/GreeksMapper.swift b/DXFeedFramework/Native/Events/Markets/GreeksMapper.swift
new file mode 100644
index 000000000..19f251c12
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/GreeksMapper.swift
@@ -0,0 +1,44 @@
+//
+//  GreeksMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class GreeksMapper: Mapper {
+    let type = dxfg_greeks_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return Greeks(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<dxfg_greeks_t>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
+        let greeks = event.greeks
+        pointee.event_flags = greeks.eventFlags
+        pointee.index = greeks.index
+        pointee.price = greeks.price
+        pointee.volatility = greeks.volatility
+        pointee.delta = greeks.delta
+        pointee.gamma = greeks.gamma
+        pointee.theta = greeks.theta
+        pointee.rho = greeks.rho
+        pointee.vega = greeks.vega
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_GREEKS
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/OptionSale+Ext.swift b/DXFeedFramework/Native/Events/Markets/OptionSale+Ext.swift
new file mode 100644
index 000000000..613825184
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/OptionSale+Ext.swift
@@ -0,0 +1,32 @@
+//
+//  OptionSale+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 13.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension OptionSale {
+    convenience init(native: dxfg_option_sale_t) {
+        self.init(String(pointee: native.market_event.event_symbol))
+
+        self.eventTime = native.market_event.event_time
+        self.eventFlags = native.event_flags
+        self.index = native.index
+        self.timeSequence = native.time_sequence
+        self.timeNanoPart = native.time_nano_part
+        self.exchangeCode = native.exchange_code
+        self.price = native.price
+        self.size = native.size
+        self.bidPrice = native.bid_price
+        self.askPrice = native.ask_price
+        self.exchangeSaleConditions = String(pointee: native.exchange_sale_conditions)
+        self.flags = native.flags
+        self.underlyingPrice = native.underlying_price
+        self.volatility = native.volatility
+        self.delta = native.delta
+        self.optionSymbol = String(pointee: native.option_symbol)
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/OptionSaleMapper.swift b/DXFeedFramework/Native/Events/Markets/OptionSaleMapper.swift
new file mode 100644
index 000000000..d6de51b1e
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/OptionSaleMapper.swift
@@ -0,0 +1,51 @@
+//
+//  OptionSaleMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 13.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class OptionSaleMapper: Mapper {
+    let type = dxfg_option_sale_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return OptionSale(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<TypeAlias>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
+        let optionSale = event.optionSale
+
+        pointee.event_flags = optionSale.eventFlags
+        pointee.index = optionSale.index
+        pointee.time_sequence = optionSale.timeSequence
+        pointee.time_nano_part = optionSale.timeNanoPart
+        pointee.exchange_code = optionSale.exchangeCode
+        pointee.price = optionSale.price
+        pointee.size = optionSale.size
+        pointee.bid_price = optionSale.bidPrice
+        pointee.ask_price = optionSale.askPrice
+        pointee.exchange_sale_conditions = optionSale.exchangeSaleConditions.toCStringRef()
+        pointee.flags = optionSale.flags
+        pointee.underlying_price = optionSale.underlyingPrice
+        pointee.volatility = optionSale.volatility
+        pointee.delta = optionSale.delta
+        pointee.option_symbol = optionSale.optionSymbol.toCStringRef()        
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_OPTION_SALE
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/Order+Ext.swift b/DXFeedFramework/Native/Events/Markets/Order+Ext.swift
new file mode 100644
index 000000000..ec6a82a55
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/Order+Ext.swift
@@ -0,0 +1,34 @@
+//
+//  Order+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension Order {
+    convenience init(native: dxfg_order_t) {
+        self.init(String(pointee: native.order_base.market_event.event_symbol))
+
+        self.eventTime = native.order_base.market_event.event_time
+        self.eventFlags = native.order_base.event_flags
+        self.index = native.order_base.index
+        self.timeSequence = native.order_base.time_sequence
+        self.timeNanoPart = native.order_base.time_nano_part
+        self.actionTime = native.order_base.action_time
+        self.orderId = native.order_base.order_id
+        self.auxOrderId = native.order_base.aux_order_id
+        self.price = native.order_base.price
+        self.size = native.order_base.size
+        self.executedSize = native.order_base.executed_size
+        self.count = native.order_base.count
+        self.flags = native.order_base.flags
+        self.tradeId = native.order_base.trade_id
+        self.tradePrice = native.order_base.trade_price
+        self.tradeSize = native.order_base.trade_size
+
+        self.marketMaker = String(pointee: native.market_maker)
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/OrderMapper.swift b/DXFeedFramework/Native/Events/Markets/OrderMapper.swift
new file mode 100644
index 000000000..2d3642a50
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/OrderMapper.swift
@@ -0,0 +1,54 @@
+//
+//  OrderMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class OrderMapper: Mapper {
+    let type = dxfg_order_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return Order(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<TypeAlias>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.order_base.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.order_base.market_event.event_time = event.eventTime
+
+        let order = event.order
+
+        pointee.order_base.market_event.event_time = order.eventTime
+        pointee.order_base.event_flags = order.eventFlags
+        pointee.order_base.index = order.index
+        pointee.order_base.time_sequence = order.timeSequence
+        pointee.order_base.time_nano_part = order.timeNanoPart
+        pointee.order_base.action_time = order.actionTime
+        pointee.order_base.order_id = order.orderId
+        pointee.order_base.aux_order_id = order.auxOrderId
+        pointee.order_base.price = order.price
+        pointee.order_base.size = order.size
+        pointee.order_base.executed_size = order.executedSize
+        pointee.order_base.count = order.count
+        pointee.order_base.flags = order.flags
+        pointee.order_base.trade_id = order.tradeId
+        pointee.order_base.trade_price = order.tradePrice
+        pointee.order_base.trade_size = order.tradeSize
+
+        pointee.market_maker = order.marketMaker?.toCStringRef()
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_ORDER
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/ProfileMapper.swift b/DXFeedFramework/Native/Events/Markets/ProfileMapper.swift
index c51039f6a..71fb4c3a2 100644
--- a/DXFeedFramework/Native/Events/Markets/ProfileMapper.swift
+++ b/DXFeedFramework/Native/Events/Markets/ProfileMapper.swift
@@ -21,6 +21,9 @@ class ProfileMapper: Mapper {
     func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
         let pointer = UnsafeMutablePointer<dxfg_profile_t>.allocate(capacity: 1)
         var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
         let profile = event.profile
         pointee.description = profile.descriptionStr?.toCStringRef()
         pointee.status_reason = profile.statusReason?.toCStringRef()
diff --git a/DXFeedFramework/Native/Events/Markets/QuoteMapper.swift b/DXFeedFramework/Native/Events/Markets/QuoteMapper.swift
index a8b63919d..5532480f0 100644
--- a/DXFeedFramework/Native/Events/Markets/QuoteMapper.swift
+++ b/DXFeedFramework/Native/Events/Markets/QuoteMapper.swift
@@ -21,6 +21,9 @@ class QuoteMapper: Mapper {
     func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
         let pointer = UnsafeMutablePointer<dxfg_quote_t>.allocate(capacity: 1)
         var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
         let quote = event.quote
         pointee.time_millis_sequence = quote.timeMillisSequence
         pointee.time_nano_part = quote.timeNanoPart
diff --git a/DXFeedFramework/Native/Events/Markets/Series+Ext.swift b/DXFeedFramework/Native/Events/Markets/Series+Ext.swift
new file mode 100644
index 000000000..62c1ce2bf
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/Series+Ext.swift
@@ -0,0 +1,28 @@
+//
+//  Series+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension Series {
+    convenience init(native: dxfg_series_t) {
+        self.init(String(pointee: native.market_event.event_symbol))
+
+        self.eventTime = native.market_event.event_time
+        self.eventFlags = native.event_flags
+        self.index = native.index
+        self.timeSequence = native.time_sequence
+        self.expiration = native.expiration
+        self.volatility = native.volatility
+        self.callVolume = native.call_volume
+        self.putVolume = native.put_volume
+        self.putCallRatio = native.put_call_ratio
+        self.forwardPrice = native.forward_price
+        self.dividend = native.dividend
+        self.interest = native.interest
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/SeriesMapper.swift b/DXFeedFramework/Native/Events/Markets/SeriesMapper.swift
new file mode 100644
index 000000000..547faf903
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/SeriesMapper.swift
@@ -0,0 +1,47 @@
+//
+//  SeriesMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class SeriesMapper: Mapper {
+    let type = dxfg_series_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return Series(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<TypeAlias>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
+        let series = event.series
+
+        pointee.index = series.index
+        pointee.event_flags = series.eventFlags
+        pointee.time_sequence = series.timeSequence
+        pointee.expiration = series.expiration
+        pointee.volatility = series.volatility
+        pointee.call_volume = series.callVolume
+        pointee.put_volume = series.putVolume
+        pointee.put_call_ratio = series.putCallRatio
+        pointee.forward_price = series.forwardPrice
+        pointee.dividend = series.dividend
+        pointee.interest = series.interest
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_SERIES
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/SpreadOrder+Ext.swift b/DXFeedFramework/Native/Events/Markets/SpreadOrder+Ext.swift
new file mode 100644
index 000000000..1390e9435
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/SpreadOrder+Ext.swift
@@ -0,0 +1,34 @@
+//
+//  SpreadOrder+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension SpreadOrder {
+    convenience init(native: dxfg_spread_order_t) {
+        self.init(String(pointee: native.order_base.market_event.event_symbol))
+
+        self.eventTime = native.order_base.market_event.event_time
+        self.eventFlags = native.order_base.event_flags
+        self.index = native.order_base.index
+        self.timeSequence = native.order_base.time_sequence
+        self.timeNanoPart = native.order_base.time_nano_part
+        self.actionTime = native.order_base.action_time
+        self.orderId = native.order_base.order_id
+        self.auxOrderId = native.order_base.aux_order_id
+        self.price = native.order_base.price
+        self.size = native.order_base.size
+        self.executedSize = native.order_base.executed_size
+        self.count = native.order_base.count
+        self.flags = native.order_base.flags
+        self.tradeId = native.order_base.trade_id
+        self.tradePrice = native.order_base.trade_price
+        self.tradeSize = native.order_base.trade_size
+
+        self.spreadSymbol = String(pointee: native.spread_symbol)
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/SpreadOrderMapper.swift b/DXFeedFramework/Native/Events/Markets/SpreadOrderMapper.swift
new file mode 100644
index 000000000..9beaa91e0
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/SpreadOrderMapper.swift
@@ -0,0 +1,54 @@
+//
+//  SpreadOrderMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 12.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class SpreadOrderMapper: Mapper {
+    let type = dxfg_spread_order_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return SpreadOrder(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<TypeAlias>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.order_base.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.order_base.market_event.event_time = event.eventTime
+
+        let order = event.spreadOrder
+
+        pointee.order_base.market_event.event_time = order.eventTime
+        pointee.order_base.event_flags = order.eventFlags
+        pointee.order_base.index = order.index
+        pointee.order_base.time_sequence = order.timeSequence
+        pointee.order_base.time_nano_part = order.timeNanoPart
+        pointee.order_base.action_time = order.actionTime
+        pointee.order_base.order_id = order.orderId
+        pointee.order_base.aux_order_id = order.auxOrderId
+        pointee.order_base.price = order.price
+        pointee.order_base.size = order.size
+        pointee.order_base.executed_size = order.executedSize
+        pointee.order_base.count = order.count
+        pointee.order_base.flags = order.flags
+        pointee.order_base.trade_id = order.tradeId
+        pointee.order_base.trade_price = order.tradePrice
+        pointee.order_base.trade_size = order.tradeSize
+
+        pointee.spread_symbol = order.spreadSymbol?.toCStringRef()
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_SPREAD_ORDER
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/Summary+Ext.swift b/DXFeedFramework/Native/Events/Markets/Summary+Ext.swift
new file mode 100644
index 000000000..31b69cdc4
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/Summary+Ext.swift
@@ -0,0 +1,26 @@
+//
+//  Summary+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension Summary {
+    convenience init(native: dxfg_summary_t) {
+        self.init(String(pointee: native.market_event.event_symbol))
+        self.eventTime = native.market_event.event_time
+        self.dayId = native.day_id
+        self.dayOpenPrice = native.day_open_price
+        self.dayHighPrice = native.day_high_price
+        self.dayLowPrice = native.day_low_price
+        self.dayClosePrice = native.day_close_price
+        self.prevDayId = native.prev_day_id
+        self.prevDayClosePrice = native.prev_day_close_price
+        self.prevDayVolume = native.prev_day_volume
+        self.openInterest = native.open_interest
+        self.flags = native.flags
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/SummaryMapper.swift b/DXFeedFramework/Native/Events/Markets/SummaryMapper.swift
new file mode 100644
index 000000000..27e7709b4
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/SummaryMapper.swift
@@ -0,0 +1,45 @@
+//
+//  SummaryMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class SummaryMapper: Mapper {
+    var type = dxfg_summary_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return Summary(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<dxfg_summary_t>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
+        let summary = event.summary
+        pointee.day_id = summary.dayId
+        pointee.day_open_price = summary.dayOpenPrice
+        pointee.day_high_price = summary.dayHighPrice
+        pointee.day_low_price = summary.dayLowPrice
+        pointee.day_close_price = summary.dayClosePrice
+        pointee.prev_day_id = summary.prevDayId
+        pointee.prev_day_close_price = summary.prevDayClosePrice
+        pointee.prev_day_volume = summary.prevDayVolume
+        pointee.open_interest = summary.openInterest
+        pointee.flags = summary.flags
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_SUMMARY
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/TheoPrice+Ext.swift b/DXFeedFramework/Native/Events/Markets/TheoPrice+Ext.swift
new file mode 100644
index 000000000..8321e898b
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/TheoPrice+Ext.swift
@@ -0,0 +1,26 @@
+//
+//  TheoPrice+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension TheoPrice {
+    convenience init(native: dxfg_theo_price_t) {
+        self.init(String(pointee: native.market_event.event_symbol))
+
+        self.eventTime = native.market_event.event_time
+        self.eventFlags = native.event_flags
+        self.index = native.index
+
+        self.price = native.price
+        self.underlyingPrice = native.underlying_price
+        self.delta = native.delta
+        self.gamma = native.gamma
+        self.dividend = native.dividend
+        self.interest = native.interest
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/TheoPriceMapper.swift b/DXFeedFramework/Native/Events/Markets/TheoPriceMapper.swift
new file mode 100644
index 000000000..d6aa29d07
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/TheoPriceMapper.swift
@@ -0,0 +1,44 @@
+//
+//  TheoPriceMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class TheoPriceMapper: Mapper {
+    let type = dxfg_theo_price_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return TheoPrice(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<dxfg_theo_price_t>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
+        let theoPrice = event.theoPrice
+
+        pointee.event_flags = theoPrice.eventFlags
+        pointee.index = theoPrice.index
+        pointee.price = theoPrice.price
+        pointee.underlying_price = theoPrice.underlyingPrice
+        pointee.delta = theoPrice.delta
+        pointee.gamma = theoPrice.gamma
+        pointee.dividend = theoPrice.dividend
+        pointee.interest = theoPrice.interest
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_THEO_PRICE
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/TimeAndSaleMapper.swift b/DXFeedFramework/Native/Events/Markets/TimeAndSaleMapper.swift
index ae4a8d55c..fd24c5d88 100644
--- a/DXFeedFramework/Native/Events/Markets/TimeAndSaleMapper.swift
+++ b/DXFeedFramework/Native/Events/Markets/TimeAndSaleMapper.swift
@@ -21,6 +21,9 @@ class TimeAndSaleMapper: Mapper {
     func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
         let pointer = UnsafeMutablePointer<dxfg_time_and_sale_t>.allocate(capacity: 1)
         var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
         let timeAndSale = event.timeAndSale
         pointee.event_flags = timeAndSale.eventFlags
         pointee.index = timeAndSale.index
diff --git a/DXFeedFramework/Native/Events/Markets/TradeMapper.swift b/DXFeedFramework/Native/Events/Markets/TradeMapper.swift
index 3ceca3879..58980388b 100644
--- a/DXFeedFramework/Native/Events/Markets/TradeMapper.swift
+++ b/DXFeedFramework/Native/Events/Markets/TradeMapper.swift
@@ -21,6 +21,9 @@ class TradeMapper: Mapper {
     func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
         let pointer = UnsafeMutablePointer<dxfg_trade_base_t>.allocate(capacity: 1)
         var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
         let trade = event.trade
         pointee.time_sequence = trade.timeSequence
         pointee.time_nano_part = trade.timeNanoPart
diff --git a/DXFeedFramework/Native/Events/Markets/Underlying+Ext.swift b/DXFeedFramework/Native/Events/Markets/Underlying+Ext.swift
new file mode 100644
index 000000000..4f871f5b5
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/Underlying+Ext.swift
@@ -0,0 +1,25 @@
+//
+//  Underlying+Ext.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+extension Underlying {
+    convenience init(native: dxfg_underlying_t) {
+        self.init(String(pointee: native.market_event.event_symbol))
+
+        self.eventTime = native.market_event.event_time
+        self.eventFlags = native.event_flags
+        self.index = native.index
+        self.volatility = native.volatility
+        self.frontVolatility = native.front_volatility
+        self.backVolatility = native.back_volatility
+        self.callVolume = native.call_volume
+        self.putVolume = native.put_volume
+        self.putCallRatio = native.put_call_ratio
+    }
+}
diff --git a/DXFeedFramework/Native/Events/Markets/UnderlyingMapper.swift b/DXFeedFramework/Native/Events/Markets/UnderlyingMapper.swift
new file mode 100644
index 000000000..00046e4ce
--- /dev/null
+++ b/DXFeedFramework/Native/Events/Markets/UnderlyingMapper.swift
@@ -0,0 +1,44 @@
+//
+//  UnderlyingMapper.swift
+//  DXFeedFramework
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import Foundation
+@_implementationOnly import graal_api
+
+class UnderlyingMapper: Mapper {
+    let type = dxfg_underlying_t.self
+
+    func fromNative(native: UnsafeMutablePointer<dxfg_event_type_t>) -> MarketEvent? {
+        let event = native.withMemoryRebound(to: type, capacity: 1) { native in
+            return Underlying(native: native.pointee)
+        }
+        return event
+    }
+
+    func toNative(event: MarketEvent) -> UnsafeMutablePointer<dxfg_event_type_t>? {
+        let pointer = UnsafeMutablePointer<dxfg_underlying_t>.allocate(capacity: 1)
+        var pointee = pointer.pointee
+        pointee.market_event.event_symbol = event.eventSymbol.toCStringRef()
+        pointee.market_event.event_time = event.eventTime
+
+        let underlying = event.underlying
+
+        pointee.event_flags = underlying.eventFlags
+        pointee.index = underlying.index
+        pointee.volatility = underlying.volatility
+        pointee.front_volatility = underlying.frontVolatility
+        pointee.back_volatility = underlying.backVolatility
+        pointee.call_volume = underlying.callVolume
+        pointee.put_volume = underlying.putVolume
+        pointee.put_call_ratio = underlying.putCallRatio
+
+        let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
+            pointer.pointee.clazz = DXFG_EVENT_UNDERLYING
+            return pointer
+        }
+        return eventType
+    }
+}
diff --git a/DXFeedFramework/Native/Graal/Isolate.swift b/DXFeedFramework/Native/Graal/Isolate.swift
index c18f6890d..827eefddd 100644
--- a/DXFeedFramework/Native/Graal/Isolate.swift
+++ b/DXFeedFramework/Native/Graal/Isolate.swift
@@ -83,6 +83,8 @@ class Isolate {
             let errorMessage = "!!!Isolate init failed: Unexpected error \(error)"
             fatalError(errorMessage)
         }
+
+        OrderSource.initAllValues()
     }
 
     // only for testing
diff --git a/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileCollector.swift b/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileCollector.swift
index 29c9f46a8..3f854a91e 100644
--- a/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileCollector.swift
+++ b/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileCollector.swift
@@ -39,7 +39,7 @@ public class NativeInstrumentProfileCollector {
             var profiles = [InstrumentProfile]()
             let listener: AnyObject = bridge(ptr: context)
             if let listener =  listener as? WeakListener {
-                let iterator = NativeProfileIterator(nativeProfiles)
+                let iterator = NativeProfileIterator(nativeProfiles, isDeallocated: false)
 
                 while (try? iterator.hasNext()) ?? false {
                     do {
@@ -109,7 +109,7 @@ public class NativeInstrumentProfileCollector {
     func view() throws -> NativeProfileIterator {
         let thread = currentThread()
         let native = try ErrorCheck.nativeCall(thread, dxfg_InstrumentProfileCollector_view(thread, collector))
-        return NativeProfileIterator(native)
+        return NativeProfileIterator(native, isDeallocated: true)
     }
 
     func setExecutor(_ executor: NativeExecutor) throws -> Bool {
@@ -134,7 +134,7 @@ public class NativeInstrumentProfileCollector {
         let weakListener = WeakListener(value: self)
         NativeInstrumentProfileCollector.listeners.append(newElement: weakListener)
         let voidPtr = bridge(obj: weakListener)
-        
+
         let callback = NativeInstrumentProfileCollector.listenerCallback
         let nativeListener = try ErrorCheck.nativeCall(thread,
                                                  dxfg_InstrumentProfileUpdateListener_new(thread,
diff --git a/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileConnection.swift b/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileConnection.swift
index a8b79c2df..ecf976320 100644
--- a/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileConnection.swift
+++ b/DXFeedFramework/Native/Ipf/Live/NativeInstrumentProfileConnection.swift
@@ -13,7 +13,7 @@ import Foundation
 class NativeInstrumentProfileConnection {
     private class WeakListener: WeakBox<NativeInstrumentProfileConnection> { }
     private static let listeners = ConcurrentArray<WeakListener>()
-    
+
     private let connection: UnsafeMutablePointer<dxfg_ipf_connection_t>
     private let address: String
 
diff --git a/DXFeedFramework/Native/Ipf/Live/NativeProfileIterator.swift b/DXFeedFramework/Native/Ipf/Live/NativeProfileIterator.swift
index 66fcf158d..11bd50c1e 100644
--- a/DXFeedFramework/Native/Ipf/Live/NativeProfileIterator.swift
+++ b/DXFeedFramework/Native/Ipf/Live/NativeProfileIterator.swift
@@ -12,12 +12,18 @@ import Foundation
 /// The location of the imported functions is in the header files "dxfg_ipf.h".
 class NativeProfileIterator {
     private let iterator: UnsafeMutablePointer<dxfg_iterable_ip_t>
+    private let isDeallocatd: Bool
     let mapper = InstrumentProfileMapper()
 
     deinit {
+        if isDeallocatd {
+            let thread = currentThread()
+            _ = try? ErrorCheck.nativeCall(thread, dxfg_JavaObjectHandler_release(thread, &(iterator.pointee.handler)))
+        }
     }
 
-    init(_ iterator: UnsafeMutablePointer<dxfg_iterable_ip_t>) {
+    init(_ iterator: UnsafeMutablePointer<dxfg_iterable_ip_t>, isDeallocated: Bool) {
+        self.isDeallocatd = isDeallocated
         self.iterator = iterator
     }
 
diff --git a/DXFeedFramework/Native/Subscription/NativeSubscription.swift b/DXFeedFramework/Native/Subscription/NativeSubscription.swift
index f480dca72..7ff83b758 100644
--- a/DXFeedFramework/Native/Subscription/NativeSubscription.swift
+++ b/DXFeedFramework/Native/Subscription/NativeSubscription.swift
@@ -13,7 +13,7 @@ import Foundation
 class NativeSubscription {
     private class WeakSubscription: WeakBox<NativeSubscription> { }
     private static let listeners = ConcurrentArray<WeakSubscription>()
-    
+
     let subscription: UnsafeMutablePointer<dxfg_subscription_t>?
     var nativeListener: UnsafeMutablePointer<dxfg_feed_event_listener_t>?
     private let mapper = EventMapper()
diff --git a/DXFeedFramework/Utils/ConcurrentDict.swift b/DXFeedFramework/Utils/ConcurrentDict.swift
index 02eab1b40..5753773ce 100644
--- a/DXFeedFramework/Utils/ConcurrentDict.swift
+++ b/DXFeedFramework/Utils/ConcurrentDict.swift
@@ -58,6 +58,27 @@ class ConcurrentDict<Key: Hashable, Value>: CustomStringConvertible {
         writer { $0.removeAll() }
     }
 
+    public func tryInsert(key: Key, value: Value) -> Bool {
+        return accessQueue.sync {
+            if set[key] == nil {
+                set[key] = value
+                return true
+            }
+            return false
+        }
+    }
+
+    public func tryGetValue(key: Key, generator: () throws -> Value) throws -> Value {
+        return try accessQueue.sync {
+            if let existingValue = set[key] {
+                return existingValue
+            }
+            let newValue = try generator()
+            set[key] = newValue
+            return newValue
+        }
+    }
+
     public func reader<U>(_ block: ([Key: Value]) throws -> U) rethrows -> U {
         try accessQueue.sync { try block(set) }
     }
diff --git a/DXFeedFramework/Utils/DayUtil.swift b/DXFeedFramework/Utils/DayUtil.swift
index 8f5ad7a67..709283bd7 100644
--- a/DXFeedFramework/Utils/DayUtil.swift
+++ b/DXFeedFramework/Utils/DayUtil.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 class DayUtil {
-    static func getYearMonthDayByDayId(_ dayId: Int) -> Int {
+    private static func getYearMonthDayByDayId(_ dayId: Int) -> Int {
         let jValue = dayId + 2472632 // this shifts the epoch back to astronomical year -4800
         let gValue = MathUtil.div(jValue, 146097)
         let dgValue = jValue - gValue * 146097
@@ -30,4 +30,8 @@ class DayUtil {
         let yyyymmddValue = abs(yyyyValue) * 10000 + mmValue * 100 + ddValue
         return Int(yyyyValue >= 0 ? yyyymmddValue : -yyyymmddValue)
     }
+
+    static func getYearMonthDayByDayId<T>(_ dayId: T) -> T where T: BinaryInteger {
+        return T(exactly: getYearMonthDayByDayId(Int(dayId))) ?? 0
+    }
 }
diff --git a/DXFeedFrameworkTests/DXExceptPublisherTests.xctestplan b/DXFeedFrameworkTests/DXExceptPublisherTests.xctestplan
index 71d04d368..255b28b10 100644
--- a/DXFeedFrameworkTests/DXExceptPublisherTests.xctestplan
+++ b/DXFeedFrameworkTests/DXExceptPublisherTests.xctestplan
@@ -32,6 +32,8 @@
         "CandleTests\/testParseLongSymbol()",
         "CandleTests\/testParseShortSymbol()",
         "CandleTests\/testSnapshot()",
+        "DateTests\/testExample()",
+        "DateTests\/testPerformanceExample()",
         "DateTimeParserTest\/testDate1()",
         "DateTimeParserTest\/testDate2()",
         "DateTimeParserTest\/testZero()",
diff --git a/DXFeedFrameworkTests/DateTests.swift b/DXFeedFrameworkTests/DateTests.swift
new file mode 100644
index 000000000..5a74e16f1
--- /dev/null
+++ b/DXFeedFrameworkTests/DateTests.swift
@@ -0,0 +1,29 @@
+//
+//  DateTests.swift
+//  DXFeedFrameworkTests
+//
+//  Created by Aleksey Kosylo on 06.10.23.
+//
+
+import XCTest
+@testable import DXFeedFramework
+
+final class DateTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testDateConvert() throws {
+        XCTAssert(19700101 == DayUtil.getYearMonthDayByDayId(0))
+        XCTAssert(19700103 == DayUtil.getYearMonthDayByDayId(Int32(2)))
+        XCTAssert(19700104 == DayUtil.getYearMonthDayByDayId(Int64(3)))
+        XCTAssert(19700105 == DayUtil.getYearMonthDayByDayId(Int64(4)))
+        XCTAssert(19700106 == DayUtil.getYearMonthDayByDayId(Int(5)))
+    }
+
+}
diff --git a/DXFeedFrameworkTests/FeedTest.swift b/DXFeedFrameworkTests/FeedTest.swift
index 6e64af147..d885e3c79 100644
--- a/DXFeedFrameworkTests/FeedTest.swift
+++ b/DXFeedFrameworkTests/FeedTest.swift
@@ -101,7 +101,19 @@ final class FeedTest: XCTestCase {
         try waitingEvent(code: .candle)
     }
 
-    fileprivate static func checkType(_ code: EventCode, _ event: MarketEvent?) -> Bool {
+    func testSeries() throws {
+        try waitingEvent(code: .series)
+    }
+
+    func testOrder() throws {
+        try waitingEvent(code: .order)
+    }
+
+//    func testOptionSale() throws {
+//        try waitingEvent(code: .optionSale)
+//    }
+
+    static func checkType(_ code: EventCode, _ event: MarketEvent?) -> Bool {
         switch code {
         case .timeAndSale:
             return event is TimeAndSale
@@ -132,15 +144,15 @@ final class FeedTest: XCTestCase {
         case .orderBase:
             break
         case .order:
-            break
+            return event is Order
         case .analyticOrder:
-            break
+            return event is AnalyticOrder
         case .spreadOrder:
-            break
+            return event is SpreadOrder
         case .series:
-            break
+            return event is Series
         case .optionSale:
-            break
+            return event is OptionSale
         }
         return false
     }
@@ -163,7 +175,7 @@ final class FeedTest: XCTestCase {
             return anonymCl
         }
         try subscription?.add(observer: listener)
-        try subscription?.addSymbols(["ETH/USD:GDAX"])
+        try subscription?.addSymbols(["ETH/USD:GDAX", "IBM"])
         wait(for: [receivedEventExp], timeout: 10)
     }
 }
diff --git a/DXFeedFrameworkTests/OrderSourceTest.swift b/DXFeedFrameworkTests/OrderSourceTest.swift
new file mode 100644
index 000000000..778a0b702
--- /dev/null
+++ b/DXFeedFrameworkTests/OrderSourceTest.swift
@@ -0,0 +1,83 @@
+//
+//  OrderSourceTest.swift
+//  DXFeedFrameworkTests
+//
+//  Created by Aleksey Kosylo on 10.10.23.
+//
+
+import XCTest
+@testable import DXFeedFramework
+
+final class OrderSourceTest: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testIsSpecialSource() throws {
+        XCTAssert(OrderSource.isSpecialSourceId(sourceId: 1))
+        XCTAssert(!OrderSource.isSpecialSourceId(sourceId: 10))
+        XCTAssert(OrderSource.isSpecialSourceId(sourceId: 2))
+    }
+
+    func testCompose() throws {
+        let res = try OrderSource.composeId(name: "1234")
+        XCTAssert(res == 825373492)
+    }
+
+    func testCheckChar() throws {
+        do {
+            try OrderSource.check(char: "a")
+        } catch {
+            XCTAssert(false, "\(error)")
+        }
+    }
+
+    func testDecode() throws {
+        do {
+            let res = try OrderSource.decodeName(identifier: 1)
+            print(res)
+        } catch {
+            print("\(error)")
+        }
+    }
+
+    func testCreateOrderSourceWithDuplicateName() throws {
+        do {
+            _ = try OrderSource( 44, "COMPOSITE_ASK", 0)
+            _ = try OrderSource( 33, "COMPOSITE_ASK", 0)
+        } catch ArgumentException.exception(let message) {
+            XCTAssert(message.contains("name"), "Wrong message \(message)")
+            return
+        } catch {
+            print("undefined error \(error)")
+        }
+        XCTAssert(false, "should be generated exception")
+    }
+
+    func testCreateOrderSourceWithDuplicateId() throws {
+        do {
+            _ = try OrderSource(3, "COMPOSITE_ASK1", 0)
+            _ = try OrderSource(3, "COMPOSITE_ASK3", 0)
+        } catch ArgumentException.exception(let message) {
+            XCTAssert(message.contains("id"), "Wrong message \(message)")
+            return
+        } catch {
+            print("undefined error \(error)")
+        }
+        XCTAssert(false, "should be generated exception")
+    }
+
+    func testVAlueOf() throws {
+        do {
+            _ = OrderSource.compsoiteBid
+            _ = try OrderSource.valueOf(identifier: 1)
+        } catch {
+            XCTAssert(false, "\(error)")            
+        }
+    }
+}
diff --git a/Samples/LatencyTestApp/LatencyViewController.swift b/Samples/LatencyTestApp/LatencyViewController.swift
index 29dac6a1b..4cf4ea4a4 100644
--- a/Samples/LatencyTestApp/LatencyViewController.swift
+++ b/Samples/LatencyTestApp/LatencyViewController.swift
@@ -52,7 +52,7 @@ class LatencyViewController: UIViewController {
         numberFormatter.maximumFractionDigits = 2
         self.connectionStatusLabel.text = DXEndpointState.notConnected.convetToString()
 
-        addressTextField.text = "mddqa.in.devexperts.com:7400"
+        addressTextField.text = ""
         timer.eventHandler = {
             self.updateUI()
         }
diff --git a/Samples/PerfTestCL/ConnectEventListener.swift b/Samples/PerfTestCL/ConnectEventListener.swift
index f701b1f6d..210e06f40 100644
--- a/Samples/PerfTestCL/ConnectEventListener.swift
+++ b/Samples/PerfTestCL/ConnectEventListener.swift
@@ -11,7 +11,7 @@ import DXFeedFramework
 class ConnectEventListener: AbstractEventListener {
     override func handleEvents(_ events: [MarketEvent]) {
         events.forEach { event in
-            print(event)
+            print(event.toString())
         }
     }
 }
diff --git a/Samples/Utils/EventCode+String.swift b/Samples/Utils/EventCode+String.swift
index 6bdf7ff55..4aabebc9d 100644
--- a/Samples/Utils/EventCode+String.swift
+++ b/Samples/Utils/EventCode+String.swift
@@ -13,10 +13,36 @@ extension EventCode {
         switch string.lowercased() {
         case "quote":
             self = .quote
-        case "timeandsale":
-            self = .timeAndSale
+        case "profile":
+            self = .profile
+        case "summary":
+            self = .summary
+        case "greeks":
+            self = .greeks
         case "candle":
             self = .candle
+        case "dailycandle":
+            self = .dailyCandle
+        case "underlying":
+            self = .underlying
+        case "theoprice":
+            self = .theoPrice
+        case "trade":
+            self = .trade
+        case "tradeeth":
+            self = .tradeETH
+        case "timeandsale":
+            self = .timeAndSale
+        case "order":
+            self = .order
+        case "analyticorder":
+            self = .analyticOrder
+        case "spreadorder":
+            self = .spreadOrder
+        case "series":
+            self = .series
+        case "optionsale":
+            self = .optionSale
         default:
             fatalError("Please, handle this case: \(string)")
         }