diff --git a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
index b18938cff..97295b55a 100644
--- a/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
+++ b/DXFeedFramework.xcodeproj/xcshareddata/xcschemes/Tools.xcscheme
@@ -64,7 +64,7 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "ScheduleSample  schedule.zip  sample.ipf.zip  AAPL 2012-05-26-14:15:00"
+            argument = "ScheduleSample  schedule.zip  sample.ipf.zip  -f AAPL 2012-05-26-14:15:00"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
@@ -76,7 +76,7 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "Connect demo.dxfeed.com:7300 quote AAPL,IBM"
+            argument = "Connect demo.dxfeed.com:7300 quote AAPL -f 2012-05-26-14:15:00"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/Samples/PerfTestCL/Arguments.swift b/Samples/PerfTestCL/Arguments.swift
index 23c7d8e31..bc0dc2318 100644
--- a/Samples/PerfTestCL/Arguments.swift
+++ b/Samples/PerfTestCL/Arguments.swift
@@ -13,12 +13,12 @@ enum ArgumentParserException: Error {
 }
 
 class Arguments {
-    private let arguments: [String]
+    private let allParameters: [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
+        if let propIndex = allParameters.firstIndex(of: "-p") {
+            allParameters[propIndex + 1].split(separator: ",").forEach { substring in
                 let prop = substring.split(separator: "=")
                 if prop.count == 2 {
                     properties[String(prop.first!)] = String(prop.last!)
@@ -31,25 +31,24 @@ class Arguments {
     }()
 
     public lazy var isQuite: Bool = {
-        if let isQuiteIndex = arguments.firstIndex(of: "-q") {
+        if let isQuiteIndex = allParameters.firstIndex(of: "-q") {
             return true
         }
         return false
     }()
 
     public lazy var tape: String? = {
-        if let tapeIndex = arguments.firstIndex(of: "-t") {
-            return arguments[tapeIndex + 1]
+        if let tapeIndex = allParameters.firstIndex(of: "-t") {
+            return allParameters[tapeIndex + 1]
         }
         return nil
     }()
 
     public lazy var time: String? = {
-        if arguments.count > 4 {
-            return arguments[4]
-        } else {
-            return nil
+        if let tapeIndex = allParameters.firstIndex(of: "-f") {
+            return allParameters[tapeIndex + 1]
         }
+        return nil
     }()
 
     init(_ cmd: [String], requiredNumberOfArguments: Int) throws {
@@ -62,28 +61,28 @@ Cmd \(cmd) contains not enough \(cmd.count - 1) arguments. Expected \(requiredNu
 """)
         }
         // 0 Arg is path to executed app
-        self.arguments =  Array(cmd[1..<cmd.count])
+        self.allParameters =  Array(cmd[1..<cmd.count])
     }
 
     public subscript(index: Int) -> String {
-        arguments[index]
+        allParameters[index]
     }
 
     public var count: Int {
-        arguments.count
+        allParameters.count
     }
 
     public func parseTypes(at index: Int) -> [EventCode] {
-        if arguments[2] == "all" {
+        if allParameters[2] == "all" {
             return EventCode.allCases
         }
-        return arguments[2].split(separator: ",").compactMap { str in
+        return allParameters[2].split(separator: ",").compactMap { str in
             return EventCode(string: String(str))
         }
     }
 
     public func parseSymbols(at index: Int) -> [Symbol] {
-        let symbols = arguments[index]
+        let symbols = allParameters[index]
         if symbols.lowercased() == "all" {
             return [WildcardSymbol.all]
         }
diff --git a/Samples/PerfTestCL/ConnectTool.swift b/Samples/PerfTestCL/ConnectTool.swift
index 9f14f8ff2..dfbf4ad54 100644
--- a/Samples/PerfTestCL/ConnectTool.swift
+++ b/Samples/PerfTestCL/ConnectTool.swift
@@ -19,7 +19,7 @@ Connect
 =======
 
 Usage:
-  Connect <address> <types> <symbols> [<time>]
+  Connect <address> <types> <symbols> [-f <time>]
 
 Where:
     address - The address to connect to retrieve data (remote host or local tape file).
diff --git a/Samples/PerfTestCL/ScheduleSample.swift b/Samples/PerfTestCL/ScheduleSample.swift
index 1efc6a21f..bfab90a0a 100644
--- a/Samples/PerfTestCL/ScheduleSample.swift
+++ b/Samples/PerfTestCL/ScheduleSample.swift
@@ -19,13 +19,13 @@ class ScheduleSample: ToolsCommand {
     A sample program that demonstrates different use cases of Schedule API.
 
     Usage:
-      usage: ScheduleSample  <defaults>  <profiles>  <symbol>  [time]
+      usage: ScheduleSample  <defaults>  <profiles>  <symbol>  [-f time]
 
     Where:
     <defaults>  is a URL to Schedule API defaults file
     <profiles>  is a URL to IPF file
     <symbol>    is a ticker symbol used for sample
-    [time]      is a time used for sample in a format yyyy-MM-dd-HH:mm:ss
+    [-f time]      is a time used for sample in a format yyyy-MM-dd-HH:mm:ss
 
     sample: ScheduleSample  schedule.properties.zip  sample.ipf.zip  IBM  2011-05-26-14:15:00