diff --git a/DXFeedFramework.xcodeproj/project.pbxproj b/DXFeedFramework.xcodeproj/project.pbxproj
index 343f35172..56507413e 100644
--- a/DXFeedFramework.xcodeproj/project.pbxproj
+++ b/DXFeedFramework.xcodeproj/project.pbxproj
@@ -189,7 +189,7 @@
 		646D19E22A3C994000C82315 /* DXFTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646D19E02A3C970700C82315 /* DXFTimer.swift */; };
 		646D19E32A3C994100C82315 /* DXFTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646D19E02A3C970700C82315 /* DXFTimer.swift */; };
 		647426A82ABC7F5E0012F793 /* ConnectEventListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647426A62ABC7F080012F793 /* ConnectEventListener.swift */; };
-		647426AD2ABC85F20012F793 /* ArgumentParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647426AC2ABC85F20012F793 /* ArgumentParser.swift */; };
+		647426AD2ABC85F20012F793 /* Arguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647426AC2ABC85F20012F793 /* Arguments.swift */; };
 		647426AF2ABC93900012F793 /* EventCode+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647426AE2ABC93900012F793 /* EventCode+String.swift */; };
 		6479BC2B2A4F35A300A3D404 /* QuoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6479BC2A2A4F35A300A3D404 /* QuoteView.swift */; };
 		6486B9582AD00BDC00D8D5FA /* Summary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6486B9572AD00BDC00D8D5FA /* Summary.swift */; };
@@ -315,7 +315,6 @@
 		64D8BB452A39BB730071BC88 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 64D8BB432A39BB730071BC88 /* Main.storyboard */; };
 		64D8BB472A39BB740071BC88 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 64D8BB462A39BB740071BC88 /* Assets.xcassets */; };
 		64D8BB4A2A39BB740071BC88 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 64D8BB482A39BB740071BC88 /* LaunchScreen.storyboard */; };
-		64D8C9522AE17739009E4799 /* Arguments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D8C9512AE17739009E4799 /* Arguments.swift */; };
 		64DA26B62AA1EF47005B1757 /* DXProfileIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64DA26B52AA1EF47005B1757 /* DXProfileIterator.swift */; };
 		64DA26B82AA20095005B1757 /* NativeInstrumentProfileConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64DA26B72AA20095005B1757 /* NativeInstrumentProfileConnection.swift */; };
 		64DA26BA2AA20AAA005B1757 /* DXInstrumentProfileConnectionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64DA26B92AA20AAA005B1757 /* DXInstrumentProfileConnectionState.swift */; };
@@ -652,7 +651,7 @@
 		6469F8D22A3B401700846831 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
 		646D19E02A3C970700C82315 /* DXFTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXFTimer.swift; sourceTree = "<group>"; };
 		647426A62ABC7F080012F793 /* ConnectEventListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectEventListener.swift; sourceTree = "<group>"; };
-		647426AC2ABC85F20012F793 /* ArgumentParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArgumentParser.swift; sourceTree = "<group>"; };
+		647426AC2ABC85F20012F793 /* Arguments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Arguments.swift; sourceTree = "<group>"; };
 		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>"; };
 		6486B9572AD00BDC00D8D5FA /* Summary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Summary.swift; sourceTree = "<group>"; };
@@ -780,7 +779,6 @@
 		64D8BB462A39BB740071BC88 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		64D8BB492A39BB740071BC88 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		64D8BB4B2A39BB740071BC88 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		64D8C9512AE17739009E4799 /* Arguments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Arguments.swift; sourceTree = "<group>"; };
 		64DA26B52AA1EF47005B1757 /* DXProfileIterator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXProfileIterator.swift; sourceTree = "<group>"; };
 		64DA26B72AA20095005B1757 /* NativeInstrumentProfileConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeInstrumentProfileConnection.swift; sourceTree = "<group>"; };
 		64DA26B92AA20AAA005B1757 /* DXInstrumentProfileConnectionState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXInstrumentProfileConnectionState.swift; sourceTree = "<group>"; };
@@ -933,8 +931,7 @@
 			children = (
 				64148B6E2ABB5C4A0063110E /* PerfTestCL.entitlements */,
 				64148B662ABB5C320063110E /* main.swift */,
-				64D8C9512AE17739009E4799 /* Arguments.swift */,
-				647426AC2ABC85F20012F793 /* ArgumentParser.swift */,
+				647426AC2ABC85F20012F793 /* Arguments.swift */,
 				647426A62ABC7F080012F793 /* ConnectEventListener.swift */,
 				645BE8532AC3229D0028243D /* ToolsCommand.swift */,
 				641BDD572AC71CCE00236B78 /* LatencyTestCommand.swift */,
@@ -1980,7 +1977,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				64D8C9522AE17739009E4799 /* Arguments.swift in Sources */,
 				648BD56D2AC56A04004A3A95 /* SubscriptionUtils.swift in Sources */,
 				648BD56B2AC4576F004A3A95 /* HelpCommand.swift in Sources */,
 				649282E82AD54919008F0F04 /* ScheduleUtils.swift in Sources */,
@@ -2000,7 +1996,7 @@
 				647426A82ABC7F5E0012F793 /* ConnectEventListener.swift in Sources */,
 				644FE5CE2AC1EC1500580E3A /* TimeInterval+Ext.swift in Sources */,
 				64148B672ABB5C320063110E /* main.swift in Sources */,
-				647426AD2ABC85F20012F793 /* ArgumentParser.swift in Sources */,
+				647426AD2ABC85F20012F793 /* Arguments.swift in Sources */,
 				64098F4E2ACD73920020D741 /* PerfTestEventListener.swift in Sources */,
 				641BDD592AC7215200236B78 /* LatencyDiagnostic.swift in Sources */,
 				648BD5692AC450D6004A3A95 /* ConnectCommand.swift in Sources */,
diff --git a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
index 2cf972c76..5d4d465a0 100644
--- a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
+++ b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
@@ -30,7 +30,7 @@
       shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -72,15 +72,11 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "Connect mddqa.in.devexperts.com:7400 Candle AAPL{=d} 20230201Z"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "Connect mddqa.in.devexperts.com:7400 OptionSale AAPL"
+            argument = "Connect demo.dxfeed.com:7300 quote AAPL,IBM"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = " Dump demo.dxfeed.com:7300 timeandsale  AAPL,IBM,ETH/USD:GDAX -t test_tape_ios.txt[format=text] -p dxfeed.wildcard.enable=true,one_more_prop=abc"
+            argument = " Dump localhost:6666 timeandsale,candle YQKNT -p dxfeed.wildcard.enable=true,one_more_prop=abc -t test_tape_ios.txt[format=text] -q"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift b/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift
index 3438b3a3f..462faf27a 100644
--- a/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift
+++ b/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift
@@ -37,6 +37,16 @@ public class TimeSeriesSubscriptionSymbol: IndexedEventSubscriptionSymbol<AnyHas
         self.init(symbol: symbol, fromTime: Long(date.timeIntervalSince1970) * 1000)
     }
 
+    /// Initializes a new instance of the ``TimeSeriesSubscriptionSymbol`` class
+    /// with a specified event symbol and from date
+    ///
+    /// - Parameters:
+    ///   - symbol: The event ``Symbol``
+    ///   - date: Date. Just for easing initialization with date object
+    convenience public init(symbol: Symbol, date: Date) {
+        self.init(symbol: symbol.stringValue, fromTime: Long(date.timeIntervalSince1970) * 1000)
+    }
+
     static func == (lhs: TimeSeriesSubscriptionSymbol, rhs: TimeSeriesSubscriptionSymbol) -> Bool {
         return lhs === rhs || lhs.symbol == rhs.symbol
     }
diff --git a/DXFeedFramework/Events/Market/Extra/OrderSource.swift b/DXFeedFramework/Events/Market/Extra/OrderSource.swift
index 98fab56bf..71199b8c7 100644
--- a/DXFeedFramework/Events/Market/Extra/OrderSource.swift
+++ b/DXFeedFramework/Events/Market/Extra/OrderSource.swift
@@ -227,7 +227,7 @@ public class OrderSource: IndexedEventSource {
                 && (name != OrderSource.decodeName(identifier: identifier)) {
                 throw ArgumentException.exception("id does not match name")
             }
-        default: break            
+        default: break
         }
         // Flag FullOrderBook requires that source must be publishable.
         if (pubFlags & OrderSource.fullOrderBook) != 0 &&
diff --git a/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift b/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift
index c78d23c78..c485ace49 100644
--- a/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift
+++ b/DXFeedFramework/Native/Endpoint/NativeEndpoint.swift
@@ -85,7 +85,7 @@ class NativeEndpoint {
     internal init(_ native: UnsafeMutablePointer<dxfg_endpoint_t>) {
         self.endpoint = native
     }
-    
+
     func getNativeFeed() -> NativeFeed? {
         return self.feed
     }
diff --git a/Samples/PerfTestCL/ArgumentParser.swift b/Samples/PerfTestCL/ArgumentParser.swift
deleted file mode 100644
index 6031008ad..000000000
--- a/Samples/PerfTestCL/ArgumentParser.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  ArgumentParser.swift
-//  PerfTestCL
-//
-//  Created by Aleksey Kosylo on 21.09.23.
-//
-
-import Foundation
-
-enum ArgumentParserException: Error {
-    case error(message: String)
-}
-
-class ArgumentParser {
-
-    func parse(_ cmd: [String], requiredNumberOfArguments: Int) throws -> [String] {
-        print("Parse \(cmd) to \(requiredNumberOfArguments) arguments")
-
-        if cmd.count - 1 < requiredNumberOfArguments {
-            throw ArgumentParserException.error(message:
-"""
-Cmd \(cmd) contains not enough \(cmd.count - 1) arguments. Expected \(requiredNumberOfArguments)
-""")
-        }
-        // 0 Arg is path to executed app
-        return Array(cmd[1..<cmd.count])
-    }
-
-    
-}
diff --git a/Samples/PerfTestCL/Arguments.swift b/Samples/PerfTestCL/Arguments.swift
index 581bdb482..c17f24ff3 100644
--- a/Samples/PerfTestCL/Arguments.swift
+++ b/Samples/PerfTestCL/Arguments.swift
@@ -1,24 +1,21 @@
 //
-//  Arguments.swift
-//  Tools
+//  ArgumentParser.swift
+//  PerfTestCL
 //
-//  Created by Aleksey Kosylo on 19.10.23.
+//  Created by Aleksey Kosylo on 21.09.23.
 //
 
 import Foundation
 import DXFeedFramework
 
-class Arguments {
-
-    let arguments: [String]
-    let symbolPosition: Int
+enum ArgumentParserException: Error {
+    case error(message: String)
+}
 
-    init(arguments: [String], symbolPosition: Int) {
-        self.arguments = arguments
-        self.symbolPosition = symbolPosition
-    }
+class Arguments {
+    private let arguments: [String]
 
-    lazy var properties: [String: String] = {
+    public lazy var properties: [String: String] = {
         var properties = [String: String]()
         if let propIndex = arguments.firstIndex(of: "-p") {
             arguments[propIndex + 1].split(separator: ",").forEach { substring in
@@ -33,22 +30,55 @@ class Arguments {
         return properties
     }()
 
-    lazy var isQuite: Bool = {
+    public lazy var isQuite: Bool = {
         if let isQuiteIndex = arguments.firstIndex(of: "-q") {
             return true
         }
         return false
     }()
 
-    lazy var tape: String? = {
+    public lazy var tape: String? = {
         if let tapeIndex = arguments.firstIndex(of: "-t") {
             return arguments[tapeIndex + 1]
         }
         return nil
     }()
 
-    func parseSymbols() -> [String] {
-        let symbols = arguments[symbolPosition]
+    public lazy var time: String? = {
+        if arguments.count > 4 {
+            return arguments[4]
+        } else {
+            return nil
+        }
+    }()
+
+    init(_ cmd: [String], requiredNumberOfArguments: Int) throws {
+        print("Parse \(cmd) to \(requiredNumberOfArguments) arguments")
+
+        if cmd.count - 1 < requiredNumberOfArguments {
+            throw ArgumentParserException.error(message:
+"""
+Cmd \(cmd) contains not enough \(cmd.count - 1) arguments. Expected \(requiredNumberOfArguments)
+""")
+        }
+        // 0 Arg is path to executed app
+        self.arguments =  Array(cmd[1..<cmd.count])
+    }
+
+    public subscript(index: Int) -> String {
+        arguments[index]
+    }
+
+    public var count: Int {
+        arguments.count
+    }
+
+    public func parseSymbols(at index: Int) -> [Symbol] {
+        let symbols = arguments[index]
+        if symbols.lowercased() == "all" {
+            return [WildcardSymbol.all]
+        }
+
         var symbolsList = [String]()
         func addSymbol(str: String) {
             if str.hasPrefix("ipf[") && str.hasSuffix("]") {
@@ -85,7 +115,6 @@ class Arguments {
                 tempSrting.append(character)
             }
         }
-
         addSymbol(str: tempSrting)
         return symbolsList
     }
diff --git a/Samples/PerfTestCL/ConnectCommand.swift b/Samples/PerfTestCL/ConnectCommand.swift
index 15f7436e8..1094616af 100644
--- a/Samples/PerfTestCL/ConnectCommand.swift
+++ b/Samples/PerfTestCL/ConnectCommand.swift
@@ -17,8 +17,6 @@ class ConnectCommand: ToolsCommand {
 Connect
 =======
 
-  "address" argument parsing error. Insufficient parameters.
-
 Usage:
   Connect <address> <types> <symbols> [<time>]
 
@@ -43,28 +41,24 @@ Where:
 
     var subscription = Subscription()
 
-    func execute() {
-        var arguments: [String]!
+    private lazy var arguments: Arguments = {
         do {
-            arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            let arguments = try Arguments(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            return arguments
         } catch {
             print(fullDescription)
+            fatalError()
         }
-        let address = arguments[1]
-        let types = arguments[2]
+    }()
 
-        var time: String?
-        if arguments.count > 4 {
-            time = arguments[4]
-        }
-        let argumentsObj = Arguments(arguments: arguments, symbolPosition: 3)
-        let symbolsList = argumentsObj.parseSymbols()
+    func execute() {
         let listener = ConnectEventListener()
-        subscription.createSubscription(address: address,
-                                        symbols: symbolsList,
-                                        types: types,
+        subscription.createSubscription(address: arguments[1],
+                                        symbols: arguments.parseSymbols(at: 3),
+                                        types: arguments[2],
                                         listener: listener,
-                                        time: time)
+                                        properties: arguments.properties,
+                                        time: arguments.time)
 
         // Print till input new line
         _ = readLine()
diff --git a/Samples/PerfTestCL/DumpCommand.swift b/Samples/PerfTestCL/DumpCommand.swift
index a27521ce0..723d3bd15 100644
--- a/Samples/PerfTestCL/DumpCommand.swift
+++ b/Samples/PerfTestCL/DumpCommand.swift
@@ -19,7 +19,7 @@ class DumpCommand: ToolsCommand {
     Enforces a streaming contract for subscription. A wildcard enabled by default.
     This was designed to receive data from a file.
     Usage: Dump <address> <types> <symbols> [<options>]
-    
+
     Where:
     <address>  is a URL to Schedule API defaults file
     <types>    is comma-separated list of dxfeed event types ({eventTypeNames}).
@@ -31,29 +31,29 @@ class DumpCommand: ToolsCommand {
     var publisher: DXPublisher?
     var isQuite = false
 
-    func execute() {
-        var arguments: [String]!
+    private lazy var arguments: Arguments = {
         do {
-            arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            let arguments = try Arguments(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            return arguments
         } catch {
             print(fullDescription)
+            fatalError()
         }
+    }()
+
+    func execute() {
         let address = arguments[1]
         let types = arguments[2]
-        let argumentsObj = Arguments(arguments: arguments, symbolPosition: 3)
-        let symbols = argumentsObj.parseSymbols()
+        let symbols = arguments.parseSymbols(at: 3)
 
-        var tapeFile = argumentsObj.tape
+        isQuite = arguments.isQuite
 
-        isQuite = argumentsObj.isQuite
-        
-        var properties = argumentsObj.properties
         do {
             let inputEndpoint = try DXEndpoint
                 .builder()
                 .withRole(.streamFeed)
                 .withProperty(DXEndpoint.Property.wildcardEnable.rawValue, "true")
-                .withProperties(properties)
+                .withProperties(arguments.properties)
                 .withName("DumpTool")
                 .build()
 
@@ -63,7 +63,7 @@ class DumpCommand: ToolsCommand {
             let subscription = try inputEndpoint.getFeed()?.createSubscription(eventTypes)
             var outputEndpoint: DXEndpoint?
 
-            if let tapeFile = tapeFile {
+            if let tapeFile = arguments.tape {
                 outputEndpoint = try DXEndpoint
                     .builder()
                     .withRole(.publisher)
diff --git a/Samples/PerfTestCL/IpfConnectCommand.swift b/Samples/PerfTestCL/IpfConnectCommand.swift
index 3bf998e06..194d51ce1 100644
--- a/Samples/PerfTestCL/IpfConnectCommand.swift
+++ b/Samples/PerfTestCL/IpfConnectCommand.swift
@@ -28,13 +28,17 @@ class IpfConnectCommand: ToolsCommand {
     sample: DXFeedIpfConnect TimeAndSale sample.ipf.zip
     """
 
-    func execute() {
-        var arguments: [String]!
+    private lazy var arguments: Arguments = {
         do {
-            arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 2)
+            let arguments = try Arguments(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 2)
+            return arguments
         } catch {
             print(fullDescription)
+            fatalError()
         }
+    }()
+
+    func execute() {
         let eventType = arguments[1]
         let ipfFile = arguments[2]
         try? SystemProperty.setProperty(DXEndpoint.Property.address.rawValue, "demo.dxfeed.com:7300")
diff --git a/Samples/PerfTestCL/LatencyTestCommand.swift b/Samples/PerfTestCL/LatencyTestCommand.swift
index e72660ec8..9af5894da 100644
--- a/Samples/PerfTestCL/LatencyTestCommand.swift
+++ b/Samples/PerfTestCL/LatencyTestCommand.swift
@@ -30,24 +30,27 @@ class LatencyTestCommand: ToolsCommand {
                         The "dxfeed.wildcard.enable" property must be set to true to enable wildcard subscription.
     """
     var subscription = Subscription()
-    func execute() {
-        var arguments: [String]!
-
+    private lazy var arguments: Arguments = {
         do {
-            arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            let arguments = try Arguments(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            return arguments
         } catch {
             print(fullDescription)
+            fatalError()
         }
+    }()
 
+    func execute() {
         let address = arguments[1]
         let types = arguments[2]
-        let symbols = arguments[3].components(separatedBy: ",")
 
         let listener = LatencyEventListener()
+
         subscription.createSubscription(address: address,
-                                        symbols: symbols,
+                                        symbols: arguments.parseSymbols(at: 3),
                                         types: types,
                                         listener: listener,
+                                        properties: arguments.properties,
                                         time: nil)
 
         let timer = DXFTimer(timeInterval: 2)
diff --git a/Samples/PerfTestCL/LiveIpfCommand.swift b/Samples/PerfTestCL/LiveIpfCommand.swift
index e20ff6ff6..28904793f 100644
--- a/Samples/PerfTestCL/LiveIpfCommand.swift
+++ b/Samples/PerfTestCL/LiveIpfCommand.swift
@@ -38,13 +38,17 @@ class LiveIpfCommand: ToolsCommand {
     var collector: DXInstrumentProfileCollector?
     var connection: DXInstrumentProfileConnection?
 
-    func execute() {
-        var arguments: [String]!
+    private lazy var arguments: Arguments = {
         do {
-            arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 1)
+            let arguments = try Arguments(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 1)
+            return arguments
         } catch {
             print(fullDescription)
+            fatalError()
         }
+    }()
+
+    func execute() {
         do {
             collector = try DXInstrumentProfileCollector()
             connection = try DXInstrumentProfileConnection(arguments[1], collector!)
diff --git a/Samples/PerfTestCL/PerfTestCommand.swift b/Samples/PerfTestCL/PerfTestCommand.swift
index bb2fb4bf9..7b2a94a0e 100644
--- a/Samples/PerfTestCL/PerfTestCommand.swift
+++ b/Samples/PerfTestCL/PerfTestCommand.swift
@@ -26,25 +26,28 @@ class PerfTestCommand: ToolsCommand {
     symbols (pos. 2)  Required. Comma-separated list of symbol names to get events for (e.g. "IBM, AAPL, MSFT").
     """
 
-    var subscription = Subscription()
-    func execute() {
-        var arguments: [String]!
-
+    private lazy var arguments: Arguments = {
         do {
-            arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            let arguments = try Arguments(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 4)
+            return arguments
         } catch {
             print(fullDescription)
+            fatalError()
         }
+    }()
 
+    var subscription = Subscription()
+    func execute() {
         let address = arguments[1]
         let types = arguments[2]
-        let symbols = arguments[3].components(separatedBy: ",")
 
         let listener = PerfTestEventListener()
+
         subscription.createSubscription(address: address,
-                                        symbols: symbols,
+                                        symbols: arguments.parseSymbols(at: 3),
                                         types: types,
                                         listener: listener,
+                                        properties: arguments.properties,
                                         time: nil)
 
         let timer = DXFTimer(timeInterval: 2)
diff --git a/Samples/PerfTestCL/ScheduleCommand.swift b/Samples/PerfTestCL/ScheduleCommand.swift
index 8529e1265..c9598cb1a 100644
--- a/Samples/PerfTestCL/ScheduleCommand.swift
+++ b/Samples/PerfTestCL/ScheduleCommand.swift
@@ -29,14 +29,17 @@ class ScheduleCommand: ToolsCommand {
     sample: ScheduleSample  schedule.properties.zip  sample.ipf.zip  IBM  2011-05-26-14:15:00
 
     """
-
-    func execute() {
-        var arguments: [String]!
+    private lazy var arguments: Arguments = {
         do {
-            arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 3)
+            let arguments = try Arguments(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 3)
+            return arguments
         } catch {
             print(fullDescription)
+            fatalError()
         }
+    }()
+
+    func execute() {
         do {
             let defaultFile = arguments[1]
             let profileFile = arguments[2]
diff --git a/Samples/PerfTestCL/SubscriptionUtils.swift b/Samples/PerfTestCL/SubscriptionUtils.swift
index 6ad1b2a8e..94f237235 100644
--- a/Samples/PerfTestCL/SubscriptionUtils.swift
+++ b/Samples/PerfTestCL/SubscriptionUtils.swift
@@ -13,31 +13,38 @@ class Subscription {
     var subscriptions = [DXFeedSubcription]()
 
     func createSubscription<O>(address: String,
-                               symbols: [String],
+                               symbols: [Symbol],
                                types: String,
                                listener: O,
+                               properties: [String: String],
                                time: String?)
-    where O: DXEventListener,
-          O: Hashable {
-              endpoint = try? DXEndpoint.builder().withRole(.feed).build()
-              _ = try? endpoint?.connect(address)
-              types.split(separator: ",").forEach { str in
-                  let subscription = try? endpoint?.getFeed()?.createSubscription(EventCode(string: String(str)))
-                  try? subscription?.add(observer: listener)
-                  if time != nil {
-                      guard let date = TimeUtil.parse(time!) else {
-                          fatalError("Couldn't parse string \(time ?? "") to Date object")
-                      }
-                      let timeSubscriptionSymbols = symbols.map { symbol in
-                          TimeSeriesSubscriptionSymbol(symbol: symbol, date: date)
-                      }
-                      try? subscription?.addSymbols(timeSubscriptionSymbols)
-                  } else {
-                      try? subscription?.addSymbols(symbols)
-                  }
-                  if let subscription = subscription {
-                      subscriptions.append(subscription)
-                  }
-              }
-          }
+    where O: DXEventListener, O: Hashable {
+        print("""
+Create subscription to \(address) for \(types):\(symbols) with properties:\(properties) and time \(time)
+""")
+        endpoint = try? DXEndpoint
+            .builder()
+            .withRole(.feed)
+            .withProperties(properties)
+            .build()
+        _ = try? endpoint?.connect(address)
+        types.split(separator: ",").forEach { str in
+            let subscription = try? endpoint?.getFeed()?.createSubscription(EventCode(string: String(str)))
+            try? subscription?.add(observer: listener)
+            if time != nil {
+                guard let date = TimeUtil.parse(time!) else {
+                    fatalError("Couldn't parse string \(time ?? "") to Date object")
+                }
+                let timeSubscriptionSymbols = symbols.map { symbol in
+                    TimeSeriesSubscriptionSymbol(symbol: symbol, date: date)
+                }
+                try? subscription?.addSymbols(timeSubscriptionSymbols)
+            } else {
+                try? subscription?.addSymbols(symbols)
+            }
+            if let subscription = subscription {
+                subscriptions.append(subscription)
+            }
+        }
+    }
 }
diff --git a/Samples/PerfTestCL/main.swift b/Samples/PerfTestCL/main.swift
index 32b682889..34da5779f 100644
--- a/Samples/PerfTestCL/main.swift
+++ b/Samples/PerfTestCL/main.swift
@@ -49,26 +49,18 @@ Where:
 """
     )
 }
-
-var arguments: [String]
-do {
-    arguments = try ArgumentParser().parse(ProcessInfo.processInfo.arguments, requiredNumberOfArguments: 1)
-} catch {
-    printGlobalHelp()
-    print(error)
-
-    exit(1)
-}
-
-let command = arguments[0]
-
-switch command {
-case "Help":
-    printGlobalHelp()
-default:
-    if let toolsCmd = getCommand(command) {
-        toolsCmd.execute()
-    } else {
+if ProcessInfo.processInfo.arguments.count > 1 {
+    let command = ProcessInfo.processInfo.arguments[1]
+    switch command {
+    case "Help":
         printGlobalHelp()
+    default:
+        if let toolsCmd = getCommand(command) {
+            toolsCmd.execute()
+        } else {
+            printGlobalHelp()
+        }
     }
+} else {
+    printGlobalHelp()
 }