diff --git a/src/hir2mpl/common/src/hir2mpl_options.cpp b/src/hir2mpl/common/src/hir2mpl_options.cpp
index 63843ddbdce5647a96d47860ee04ebc579374798..9debcd1921fce6b19e1e1f000c8b169d3647bbfc 100644
--- a/src/hir2mpl/common/src/hir2mpl_options.cpp
+++ b/src/hir2mpl/common/src/hir2mpl_options.cpp
@@ -302,7 +302,7 @@ const Descriptor kUsage[] = {
   { kSafeRegion, 0, "", "safe-region",
     kBuildTypeAll, kArgCheckPolicyNone,
     "  -safe-region            : EnhanceC: enable safe region", "hir2mpl", {} },
-  { kO2, 0, "", "O2",
+  { kO2, 0, "O2", "",
     kBuildTypeAll, kArgCheckPolicyNone,
     "  -O2                     : enable hir2mpl O2 optimize", "hir2mpl", {} },
   { kSimplifyShortCircuit, 0, "", "simplify-short-circuit",
@@ -310,7 +310,7 @@ const Descriptor kUsage[] = {
     "  -simplify-short-circuit : enable simplify short circuit", "hir2mpl", {} },
   { kEnableVariableArray, 0, "", "enable-variable-array",
     kBuildTypeAll, kArgCheckPolicyNone,
-    "  -enable-variable-array : enable variable array", "hir2mpl", {} },
+    "  --enable-variable-array : enable variable array", "hir2mpl", {} },
   { kFuncInlineSize, 0, "", "func-inline-size",
     kBuildTypeAll, kArgCheckPolicyRequired,
     "  -func-inline-size       : set func inline size", "hir2mpl", {} },
diff --git a/src/mapleall/maple_be/src/cg/cg_option.cpp b/src/mapleall/maple_be/src/cg/cg_option.cpp
index aebe679fd59246644cccebc115c0c78f9a8b3196..74e6902ee0cbd0cc7cfc3850580cd1629c6ecb4b 100644
--- a/src/mapleall/maple_be/src/cg/cg_option.cpp
+++ b/src/mapleall/maple_be/src/cg/cg_option.cpp
@@ -215,7 +215,7 @@ const Descriptor kUsage[] = {
     "  --pie                       \tGenerate position-independent executable\n"
     "  --no-pie\n",
     "mplcg",
-    {} },
+    {"driver"} },
   { kPic,
     kEnable,
     "",
@@ -225,7 +225,7 @@ const Descriptor kUsage[] = {
     "  --fpic                      \tGenerate position-independent shared library\n"
     "  --no-fpic\n",
     "mplcg",
-    {} },
+    {"driver"} },
   { kCGVerbose,
     kEnable,
     "",
@@ -708,8 +708,8 @@ const Descriptor kUsage[] = {
     {} },
   { kCGO0,
     0,
-    "",
     "O0",
+    "",
     kBuildTypeExperimental,
     kArgCheckPolicyNone,
     "  -O0                         \tNo optimization.\n",
@@ -717,8 +717,8 @@ const Descriptor kUsage[] = {
     {} },
   { kCGO1,
     0,
-    "",
     "O1",
+    "",
     kBuildTypeExperimental,
     kArgCheckPolicyOptional,
     "  -O1                         \tDo some optimization.\n",
@@ -726,8 +726,8 @@ const Descriptor kUsage[] = {
     {} },
   { kCGO2,
     0,
-    "",
     "O2",
+    "",
     kBuildTypeProduct,
     kArgCheckPolicyOptional,
     "  -O2                          \tDo some optimization.\n",
@@ -1066,7 +1066,7 @@ const Descriptor kUsage[] = {
     " --omit-frame-pointer          \t do not use frame pointer \n"
     " --no-omit-frame-pointer\n",
     "mplcg",
-    {} },
+    {"driver"} },
   { kFastMath,
     kEnable,
     "",
diff --git a/src/mapleall/maple_driver/include/file_utils.h b/src/mapleall/maple_driver/include/file_utils.h
index 5e233b725e47f4f376bdd88b549c7e29051917f0..921d3fa489d81d1ebf354c25da3e344a19fada5c 100644
--- a/src/mapleall/maple_driver/include/file_utils.h
+++ b/src/mapleall/maple_driver/include/file_utils.h
@@ -29,6 +29,7 @@ class FileUtils {
   static std::string GetFileName(const std::string &filePath, bool isWithExtension);
   static std::string GetFileExtension(const std::string &filePath);
   static std::string GetFileFolder(const std::string &filePath);
+  static std::string GetExecutable();
   static int Remove(const std::string &filePath);
   static std::string AppendMapleRootIfNeeded(bool needRootPath, const std::string &path,
                                              const std::string &defaultRoot = "." + kFileSeperatorStr);
diff --git a/src/mapleall/maple_driver/include/option_descriptor.h b/src/mapleall/maple_driver/include/option_descriptor.h
index f1e83553e8a7c79c674959c3dfe8c7f56e8d5b44..c68ff769a7e4df28e4581a359570eafaed42de66 100644
--- a/src/mapleall/maple_driver/include/option_descriptor.h
+++ b/src/mapleall/maple_driver/include/option_descriptor.h
@@ -15,6 +15,7 @@
 #ifndef MAPLE_OPTION_DESCRIPTOR_H
 #define MAPLE_OPTION_DESCRIPTOR_H
 #include <vector>
+#include <map>
 #include <string>
 #include <algorithm>
 
@@ -103,6 +104,8 @@ class Option {
 
   ~Option() = default;
 
+  std::string GetPrefix() const;
+
   size_t Index() const {
     return descriptor.index;
   }
diff --git a/src/mapleall/maple_driver/include/option_parser.h b/src/mapleall/maple_driver/include/option_parser.h
index 9b6fbd2a0aac50554b7c71cda0efb26771610aea..3b19beae2566fa1b0782b7a248d16db37d81cb0e 100644
--- a/src/mapleall/maple_driver/include/option_parser.h
+++ b/src/mapleall/maple_driver/include/option_parser.h
@@ -17,12 +17,30 @@
 #include <deque>
 #include <map>
 #include <string>
+#include <string_view>
 #include <vector>
 #include "error_code.h"
 #include "option_descriptor.h"
 #include "driver_option_common.h"
 
 namespace mapleOption {
+
+OptionPrefixType DetectOptPrefix(std::string_view opt);
+std::pair<maple::ErrorCode, std::string_view> ExtractKey(std::string_view opt,
+                                                         OptionPrefixType prefix);
+
+/* This structure is used to aggregate option information during option parsing.
+ * It's a string view from original input command line string. */
+struct Arg {
+  explicit Arg(std::string_view arg) : rawArg(arg) {}
+  std::string_view rawArg; /* full option, like "--key=value"  */
+  std::string_view key; /* Extracted key, like "--key" */
+  std::string_view val; /* Extracted value, like "value" */
+  OptionPrefixType prefixType = undefinedOpt;
+  bool isEqualOpt = false; /* indicates whether the parsed option contained "=" symbol.
+                              For options like --key=value, it's true. For options like --key value, it's false */
+};
+
 class OptionParser {
  public:
   OptionParser() = default;
@@ -31,9 +49,9 @@ class OptionParser {
   void RegisteUsages(const maple::MapleDriverOptionBase &base);
   void RegisteUsages(const Descriptor usage[]);
 
-  maple::ErrorCode Parse(int argc, char **argv, const std::string exeName = "all");
+  maple::ErrorCode Parse(int argc, char **argv, const std::string exeName = "driver");
 
-  maple::ErrorCode HandleInputArgs(const std::vector<std::string> &inputArgs, const std::string &exeName,
+  maple::ErrorCode HandleInputArgs(std::vector<Arg> &inputArgs, const std::string &exeName,
                                    std::deque<mapleOption::Option> &inputOption, bool isAllOption = false);
 
   const std::deque<Option> &GetOptions() const {
@@ -64,12 +82,12 @@ class OptionParser {
     OptionPrefixType type;
   };
 
-  bool HandleKeyValue(const std::string &key, const std::string &value,
-                      std::deque<mapleOption::Option> &inputOption, const std::string &exeName,
-                      bool isAllOption = true, bool isEqualPrefix = false);
-  bool CheckOpt(const std::string option, std::string &lastKey, bool &isLastMatch,
-                std::deque<mapleOption::Option> &inputOption, const std::string &exeName);
-  bool CheckJoinedOption(const std::string &option,
+  bool HandleKeyValue(const Arg &arg, std::deque<mapleOption::Option> &inputOption,
+                      const std::string &exeName);
+  bool CheckOpt(std::vector<Arg> &inputArgs, size_t &argsIndex,
+                std::deque<mapleOption::Option> &inputOption,
+                const std::string &exeName);
+  bool CheckJoinedOption(Arg &arg,
                          std::deque<mapleOption::Option> &inputOption,
                          const std::string &exeName);
   void InsertOption(const std::string &opt, const Descriptor &usage,
@@ -79,12 +97,11 @@ class OptionParser {
     }
   }
 
-  bool CheckSpecialOption(const std::string &option, std::string &key, std::string &value);
   std::vector<Descriptor> rawUsages;
-  std::multimap<std::string, UsageWrp> usages;
+  /* std::less comparator is used to mix string and string_view as map keys */
+  std::multimap<std::string, UsageWrp, std::less<>> usages;
   std::deque<Option> options;
   std::vector<std::string> nonOptionsArgs;
-  bool isValueEmpty = false;
 };
 enum MatchedIndex {
   kMatchNone,
diff --git a/src/mapleall/maple_driver/src/compiler.cpp b/src/mapleall/maple_driver/src/compiler.cpp
index 8fb9f24cb4aa27387d40d6787cf440e86c25e33e..224e3b0b7e491e1f1be213f533d9f609712681e0 100644
--- a/src/mapleall/maple_driver/src/compiler.cpp
+++ b/src/mapleall/maple_driver/src/compiler.cpp
@@ -99,16 +99,10 @@ void Compiler::AppendExtraOptions(std::vector<MplOption> &finalOptions,
   }
 
   for (const Option &opt : exeOption->second) {
-    std::string prefix;
-    if (opt.GetPrefixType() == mapleOption::shortOptPrefix) {
-      prefix = "-";
-    } else if (opt.GetPrefixType() == mapleOption::longOptPrefix) {
-      prefix = "--";
-    }
-
-    const std::string baseKey = opt.OptionKey();
+    std::string prefix = opt.GetPrefix();
+    const std::string &baseKey = opt.OptionKey();
     const std::string key = prefix + baseKey;
-    const std::string value  = opt.Args();
+    const std::string &value  = opt.Args();
 
     /* Default behaviour: extra options do not replace default options,
      * because it can be some additional option with the same key.
diff --git a/src/mapleall/maple_driver/src/driver_option_common.cpp b/src/mapleall/maple_driver/src/driver_option_common.cpp
index 4b1eca59c36bc2725bfbf2dd2e192f85e4d41133..765280745382ae10b1c450a5441fa93e716a8848 100644
--- a/src/mapleall/maple_driver/src/driver_option_common.cpp
+++ b/src/mapleall/maple_driver/src/driver_option_common.cpp
@@ -31,7 +31,7 @@ const mapleOption::Descriptor kUsages[] = {
     "  Example 2: <Maple bin path>/maple -O2 --mplt=mpltPath inputFile.dex\n\n"
     "==============================\n"
     "  Options:\n",
-    "all",
+    "driver",
     {} },
   { kHelp,
     0,
@@ -43,7 +43,7 @@ const mapleOption::Descriptor kUsages[] = {
     "                              \tTo print the help info of specified compiler,\n"
     "                              \tyou can use jbc2mpl, me, mpl2mpl, mplcg... as the COMPILERNAME\n"
     "                              \teg: --help=mpl2mpl\n",
-    "all",
+    "driver",
     {} },
   { kVersion,
     0,
@@ -52,7 +52,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyOptional,
     "  --version [command]         \tPrint version and exit.\n",
-    "all",
+    "driver",
     {} },
   { kInFile,
     0,
@@ -61,7 +61,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyRequired,
     "  --infile file1,file2,file3  \tInput files.\n",
-    "all",
+    "driver",
     {} },
   { kInMplt,
     0,
@@ -70,7 +70,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyRequired,
     "  --mplt=file1,file2,file3    \tImport mplt files.\n",
-    "all",
+    "driver",
     { "jbc2mpl",
       "dex2mpl"
     } },
@@ -81,7 +81,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  -O0                         \tNo optimization.\n",
-    "all",
+    "driver",
     {} },
   { kOptimization1,
     0,
@@ -90,7 +90,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeExperimental,
     kArgCheckPolicyNone,
     "  -O1                         \tDo some optimization.\n",
-    "all",
+    "driver",
     {} },
   { kOptimization2,
     0,
@@ -99,7 +99,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  -O2                         \tDo more optimization. (Default)\n",
-    "all",
+    "driver",
     {"hir2mpl"} },
   { kPartO2,
     0,
@@ -108,7 +108,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --partO2               \tSet func list for O2\n",
-    "all",
+    "driver",
     {} },
   { kWithIpa,
     kEnable,
@@ -118,7 +118,7 @@ const mapleOption::Descriptor kUsages[] = {
     kArgCheckPolicyBool,
     "  --with-ipa                  \tRun IPA when building\n"
     "  --no-with-ipa               \n",
-    "all",
+    "driver",
     {} },
   { kVerify,
     kEnable,
@@ -127,7 +127,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeExperimental,
     kArgCheckPolicyNone,
     "  --verify                    \tVerify mpl file\n",
-    "all",
+    "driver",
     { "dex2mpl", "mpl2mpl" } },
   { kJbc2mplOpt,
     0,
@@ -136,7 +136,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --jbc2mpl-opt               \tSet options for jbc2mpl\n",
-    "all",
+    "driver",
     {} },
   { kCpp2mplOpt,
     0,
@@ -145,7 +145,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --hir2mpl-opt               \tSet options for hir2mpl\n",
-    "all",
+    "driver",
     {} },
   { kAsOpt,
     0,
@@ -154,7 +154,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "--as-opt                      \tSet options for as\n",
-    "all",
+    "driver",
     {} },
   { kLdOpt,
     0,
@@ -163,7 +163,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "--ld-opt                      \tSet options for ld\n",
-    "all",
+    "driver",
     {} },
   { kDex2mplOpt,
     0,
@@ -172,7 +172,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --dex2mpl-opt               \tSet options for dex2mpl\n",
-    "all",
+    "driver",
     {} },
   { kMplipaOpt,
     0,
@@ -181,7 +181,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --mplipa-opt                \tSet options for mplipa\n",
-    "all",
+    "driver",
     {} },
   { kMplcgOpt,
     0,
@@ -190,7 +190,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --mplcg-opt                  \tSet options for mplcg\n",
-    "all",
+    "driver",
     {} },
   { kDecoupleStatic,
     kEnable,
@@ -200,7 +200,7 @@ const mapleOption::Descriptor kUsages[] = {
     kArgCheckPolicyBool,
     "  --decouple-static           \tdecouple the static method and field\n"
     "  --no-decouple-static        \tDon't decouple the static method and field\n",
-    "all",
+    "driver",
     { "dex2mpl", "me", "mpl2mpl" } },
   { kProfilePath,
     0,
@@ -210,7 +210,7 @@ const mapleOption::Descriptor kUsages[] = {
     kArgCheckPolicyRequired,
     "  --profile                   \tFor PGO optimization\n"
     "                              \t--profile=list_file\n",
-    "all",
+    "driver",
     { "dex2mpl", "mpl2mpl", "mplcg" } },
   { kGCOnly,
     kEnable,
@@ -220,7 +220,7 @@ const mapleOption::Descriptor kUsages[] = {
     kArgCheckPolicyBool,
     "  --gconly                     \tMake gconly is enable\n"
     "  --no-gconly                  \tDon't make gconly is enable\n",
-    "all",
+    "driver",
     {
       "dex2mpl", "me", "mpl2mpl",
       "mplcg"
@@ -233,7 +233,7 @@ const mapleOption::Descriptor kUsages[] = {
     kArgCheckPolicyBool,
     "  --BigEndian/--Be                     \tUsing BigEndian\n"
     "  --no-BigEndian/ --no-Be              \tUsing LittleEndian\n",
-    "all",
+    "driver",
     {
       "me", "mpl2mpl",
       "mplcg"
@@ -245,7 +245,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --me-opt                    \tSet options for me\n",
-    "all",
+    "driver",
     {} },
   { kMpl2MplOpt,
     0,
@@ -254,7 +254,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --mpl2mpl-opt               \tSet options for mpl2mpl\n",
-    "all",
+    "driver",
     {} },
   { kSaveTemps,
     0,
@@ -266,7 +266,7 @@ const mapleOption::Descriptor kUsages[] = {
     "                              \t--save-temps Save all intermediate files.\n"
     "                              \t--save-temps=file1,file2,file3 Save the\n"
     "                              \ttarget files.\n",
-    "all",
+    "driver",
     {} },
   { kRun,
     0,
@@ -280,7 +280,7 @@ const mapleOption::Descriptor kUsages[] = {
     "                              \tjbc2mpl, me, mpl2mpl, mplcg\n"
     "                              \tInput file must match the tool can\n"
     "                              \thandle\n",
-    "all",
+    "driver",
     {} },
   { kOption,
     0,
@@ -292,7 +292,7 @@ const mapleOption::Descriptor kUsages[] = {
     "                              \tseparated by \":\".\n"
     "                              \tThe sequence must match the sequence in\n"
     "                              \t--run.\n",
-    "all",
+    "driver",
     {} },
   { kTimePhases,
     0,
@@ -301,7 +301,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeExperimental,
     kArgCheckPolicyNone,
     "  -time-phases                \tTiming phases and print percentages\n",
-    "all",
+    "driver",
     {} },
   { kGenMeMpl,
     0,
@@ -310,7 +310,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --genmempl                  \tGenerate me.mpl file\n",
-    "all",
+    "driver",
     {} },
   { kGenObj,
     kEnable,
@@ -319,7 +319,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  -c                          \tCompile or assemble the source files, but do not link.\n",
-    "all",
+    "driver",
     {}  },
   { kGenVtableImpl,
     0,
@@ -328,7 +328,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --genVtableImpl             \tGenerate VtableImpl.mpl file\n",
-    "all",
+    "driver",
     {} },
   { kVerbose,
     kEnable,
@@ -337,7 +337,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeDebug,
     kArgCheckPolicyBool,
     "  -verbose                    \t: print informations\n",
-    "all",
+    "driver",
     { "jbc2mpl", "hir2mpl", "me", "mpl2mpl", "mplcg" } },
   { kAllDebug,
     0,
@@ -346,7 +346,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeDebug,
     kArgCheckPolicyNone,
     "  --debug                     \tPrint debug info.\n",
-    "all",
+    "driver",
     {} },
   { kWithDwarf,
     0,
@@ -355,7 +355,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeDebug,
     kArgCheckPolicyNone,
     "  -g                          \t: with dwarf\n",
-    "all",
+    "driver",
     {} },
   { kHelpLevel,
     0,
@@ -368,7 +368,7 @@ const mapleOption::Descriptor kUsages[] = {
     "                              \tNUM=1: Product options\n"
     "                              \tNUM=2: Experimental options\n"
     "                              \tNUM=3: Debug options\n",
-    "all",
+    "driver",
     {} },
   { kNpeNoCheck,
     0,
@@ -377,7 +377,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --no-npe-check              \tDisable null pointer check (Default)\n",
-    "all",
+    "driver",
     {} },
   { kNpeStaticCheck,
     0,
@@ -386,7 +386,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --npe-check-static          \tEnable null pointer static check only\n",
-    "all",
+    "driver",
     {} },
   { kNpeDynamicCheck,
     0,
@@ -395,7 +395,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --npe-check-dynamic         \tEnable null pointer dynamic check with static warning\n",
-    "all",
+    "driver",
     {} },
   { kNpeDynamicCheckSilent,
     0,
@@ -404,7 +404,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --npe-check-dynamic-silent  \tEnable null pointer dynamic without static warning\n",
-    "all",
+    "driver",
     {} },
   { kNpeDynamicCheckAll,
     0,
@@ -413,7 +413,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --npe-check-dynamic-all     \tKeep dynamic check before dereference, used with --npe-check-dynamic* options\n",
-    "all",
+    "driver",
     {} },
   { kBoundaryNoCheck,
     0,
@@ -422,7 +422,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --no-boundary-check         \tDisable boundary check (Default)\n",
-    "all",
+    "driver",
     {} },
   { kBoundaryStaticCheck,
     0,
@@ -431,7 +431,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --boundary-check-static     \tEnable boundary static check\n",
-    "all",
+    "driver",
     {} },
   { kBoundaryDynamicCheck,
     0,
@@ -440,7 +440,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --boundary-check-dynamic    \tEnable boundary dynamic check with static warning\n",
-    "all",
+    "driver",
     {} },
   { kBoundaryDynamicCheckSilent,
     0,
@@ -449,7 +449,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeProduct,
     kArgCheckPolicyNone,
     "  --boundary-check-dynamic-silent  \tEnable boundary dynamic check without static warning\n",
-    "all",
+    "driver",
     {} },
   { kSafeRegionOption,
       0,
@@ -458,7 +458,7 @@ const mapleOption::Descriptor kUsages[] = {
       kBuildTypeProduct,
       kArgCheckPolicyNone,
       "  --safe-region \tEnable safe region\n",
-      "all",
+      "driver",
       {} },
   { kMaplePrintPhases,
     0,
@@ -467,7 +467,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyOptional,
     "  -maple-print-phases         \tPrint Driver Phases.\n  --maple-print-phases\n",
-    "all",
+    "driver",
     {} },
   { kLdStatic,
     0,
@@ -476,7 +476,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyNone,
     "  -static                     \tForce the linker to link a program statically\n",
-    "all",
+    "driver",
     {"ld"} },
   { kLdLib,
     0,
@@ -485,7 +485,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyRequired,
     "  -l <lib>                    \tLinks with a library file\n",
-    "all",
+    "driver",
     {"ld"} },
   { kLdLibPath,
     0,
@@ -494,7 +494,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyRequired,
     "  -L <libpath>                \tAdd directory to library search path\n",
-    "all",
+    "driver",
     {"ld"} },
   { kClangMacro,
     0,
@@ -503,7 +503,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyRequired,
     "  -D <macro>=<value>          \tDefine <macro> to <value> (or 1 if <value> omitted)\n",
-    "all",
+    "driver",
     {"clang"} },
   { kClangMacro,
     0,
@@ -512,7 +512,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyRequired,
     "  -U <macro>                  \tUndefine macro <macro>\n",
-    "all",
+    "driver",
     {"clang"} },
   { kClangInclude,
     0,
@@ -521,7 +521,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyRequired,
     "  -I <dir>                    \tAdd directory to include search path\n",
-    "all",
+    "driver",
     {"clang"} },
   { kClangISystem,
     0,
@@ -530,7 +530,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyRequired,
     "  -isystem <dir>              \tAdd directory to SYSTEM include search path\n",
-    "all",
+    "driver",
     {"clang"} },
   { kMaplePhaseOnly,
     kEnable,
@@ -539,7 +539,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyBool,
     "  --maple-phase               \tRun maple phase only\n  --no-maple-phase\n",
-    "all",
+    "driver",
     {} },
   { kMapleOut,
     0,
@@ -548,7 +548,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyRequired,
     "  -o <outfile>                \tPlace the output into <file>\n",
-    "all",
+    "driver",
     {} },
   { kUnknown,
     0,
@@ -557,7 +557,7 @@ const mapleOption::Descriptor kUsages[] = {
     kBuildTypeAll,
     kArgCheckPolicyNone,
     "",
-    "all",
+    "driver",
     {} }
 };
 }  // namepsace
diff --git a/src/mapleall/maple_driver/src/file_utils.cpp b/src/mapleall/maple_driver/src/file_utils.cpp
index 30600ae652a8211af013dff00fc057b669ca5a5a..58ca402be576abdb667c26efc54ee78c8e69ffd5 100644
--- a/src/mapleall/maple_driver/src/file_utils.cpp
+++ b/src/mapleall/maple_driver/src/file_utils.cpp
@@ -15,6 +15,7 @@
 #include <cstdio>
 #include <cstring>
 #include <climits>
+#include <unistd.h>
 #include "file_utils.h"
 #include "string_utils.h"
 #include "mpl_logging.h"
@@ -82,6 +83,39 @@ std::string FileUtils::GetFileExtension(const std::string &filePath) {
   return StringUtils::GetStrAfterLast(filePath, ".", true);
 }
 
+std::string FileUtils::GetExecutable() {
+#ifdef _WIN32
+  static_assert(false, "Implement me for Windows");
+
+#else /* _WIN32 */
+  /* Linux Implementation */
+  char exePath[PATH_MAX];
+  const char *symLinkToCurrentExe = "/proc/self/exe";
+
+  int len = readlink(symLinkToCurrentExe, exePath, sizeof(exePath));
+  ASSERT(len >= 0, "Something wrong: %d, Not Linux System??\n", len);
+
+  /* Add Null terminate for the string: readlink does not
+   * append a terminating null byte to buf */
+  len = std::min(len, static_cast<int>(sizeof(exePath) - 1));
+  exePath[len] = '\0';
+
+  /* On Linux, /proc/self/exe always looks through symlinks. However, on
+   * GNU/Hurd, /proc/self/exe is a symlink to the path that was used to start
+   * the program, and not the eventual binary file. Therefore, call realpath
+   * so this behaves the same on all platforms.
+   */
+  if (char *realPath = realpath(exePath, nullptr)) {
+    std::string ret = std::string(realPath);
+    free(realPath);
+    return ret;
+  }
+  ASSERT(false, "Something wrong: %s\n", exePath);
+
+  return "";
+#endif /* _WIN32 */
+}
+
 std::string FileUtils::GetFileFolder(const std::string &filePath) {
   std::string folder = StringUtils::GetStrBeforeLast(filePath, kFileSeperatorStr, true);
   std::string curSlashType = kFileSeperatorStr;
diff --git a/src/mapleall/maple_driver/src/maple_comb_compiler.cpp b/src/mapleall/maple_driver/src/maple_comb_compiler.cpp
index 3ae6df36eb220ca2ad7f43ad33038943a7fccfad..58ec7f6748c44518d0ee52d751d8b022e31bcee7 100644
--- a/src/mapleall/maple_driver/src/maple_comb_compiler.cpp
+++ b/src/mapleall/maple_driver/src/maple_comb_compiler.cpp
@@ -75,7 +75,8 @@ void MapleCombCompiler::PrintCommand(const MplOptions &options, const Action &ac
     auto it = options.GetExeOptions().find(kBinNameMe);
     for (const mapleOption::Option &opt : it->second) {
       connectSym = !opt.Args().empty() ? "=" : "";
-      optionStr << " --" << opt.OptionKey() << connectSym << opt.Args();
+      auto prefixStr = opt.GetPrefix();
+      optionStr << " " << prefixStr << opt.OptionKey() << connectSym << opt.Args();
     }
     firstComb = true;
   }
@@ -89,7 +90,8 @@ void MapleCombCompiler::PrintCommand(const MplOptions &options, const Action &ac
     auto it = options.GetExeOptions().find(kBinNameMpl2mpl);
     for (const mapleOption::Option &opt : it->second) {
       connectSym = !opt.Args().empty() ? "=" : "";
-      optionStr << " --" << opt.OptionKey() << connectSym << opt.Args();
+      auto prefixStr = opt.GetPrefix();
+      optionStr << " " << prefixStr << opt.OptionKey() << connectSym << opt.Args();
     }
   }
 
diff --git a/src/mapleall/maple_driver/src/maple_comb_compiler_wrapper.cpp b/src/mapleall/maple_driver/src/maple_comb_compiler_wrapper.cpp
index 0e3463c78285167a79e467ca961590321667b9ae..92974c88292b85af4fea7775fe61ef8ba099d66c 100644
--- a/src/mapleall/maple_driver/src/maple_comb_compiler_wrapper.cpp
+++ b/src/mapleall/maple_driver/src/maple_comb_compiler_wrapper.cpp
@@ -39,7 +39,7 @@ DefaultOption MapleCombCompilerWrp::GetDefaultOptions(const MplOptions &mplOptio
   uint32 optForWrapperCnt = 0;
   for (Option &opt : options) {
     auto desc = opt.GetDescriptor();
-    if (desc.exeName == "all" ||
+    if (desc.exeName == "driver" ||
         desc.exeName == "mpl2mpl" ||
         desc.exeName == "mplcg" ||
         desc.exeName == "me") {
@@ -66,13 +66,7 @@ DefaultOption MapleCombCompilerWrp::GetDefaultOptions(const MplOptions &mplOptio
       continue;
     }
 
-    std::string strOpt;
-    if (tmpOptions[tmpOpInd]->GetPrefixType() == shortOptPrefix) {
-      strOpt = "-";
-    } else if (tmpOptions[tmpOpInd]->GetPrefixType() == longOptPrefix) {
-      strOpt = "--";
-    }
-
+    std::string strOpt = tmpOptions[tmpOpInd]->GetPrefix();
     if (!tmpOptions[tmpOpInd]->OptionKey().empty()) {
       strOpt += tmpOptions[tmpOpInd]->OptionKey();
     }
diff --git a/src/mapleall/maple_driver/src/mpl_options.cpp b/src/mapleall/maple_driver/src/mpl_options.cpp
index e4eeb40f550f6cc7c9262059e723621eb7a6ef66..e0a94347577f6e2b7bcafc08821c79f9a0e9ca39 100644
--- a/src/mapleall/maple_driver/src/mpl_options.cpp
+++ b/src/mapleall/maple_driver/src/mpl_options.cpp
@@ -71,7 +71,7 @@ int MplOptions::Parse(int argc, char **argv) {
   optionParser->RegisteUsages(Options::GetInstance());
   optionParser->RegisteUsages(MeOption::GetInstance());
   optionParser->RegisteUsages(CGOptions::GetInstance());
-  exeFolder = FileUtils::GetFileFolder(*argv);
+  exeFolder = FileUtils::GetFileFolder(FileUtils::GetExecutable());
   int ret = optionParser->Parse(argc, argv);
   if (ret != kErrorNoError) {
     return ret;
@@ -145,7 +145,7 @@ ErrorCode MplOptions::HandleGeneralOptions() {
             return kErrorExitHelp;
           }
         }
-        optionParser->PrintUsage("all", helpLevel);
+        optionParser->PrintUsage("driver", helpLevel);
         return kErrorExitHelp;
       }
       case kVersion: {
@@ -641,21 +641,31 @@ ErrorCode MplOptions::CheckFileExits() {
 
 ErrorCode MplOptions::AddOption(const mapleOption::Option &option) {
   if (!option.HasExtra()) {
-    if (option.GetExeName() == "all") {
+    if (option.GetExeName() == "driver") {
       /* If it doesn't have extra options and it's a common option for driver,
-       * set this option in exeOptions as "all"" to use this info in debug print.
+       * set this option in exeOptions as "driver"" to use this info in debug print.
        */
       exeOptions[option.GetExeName()].push_back(option);
     }
     return kErrorNoError;
   }
+
   for (const auto &exeName : option.GetExtras()) {
-    auto iter = std::find(runningExes.begin(), runningExes.end(), exeName);
+
+    /* extras field in Descriptor allows to register an option in additional tool.
+     * If extras exeName == driver name ("driver"), it means that this option
+     * is registered outside the driver, but this option can be used by the driver.
+     * In this case the tool is set in Descriptor.exeName (not in Descriptor.extras).
+     * And Descriptor.extras=="driver" shows only that this option can be handled by the driver.
+     */
+    const std::string &exe = (exeName == "driver") ? option.GetExeName() : exeName;
+
+    auto iter = std::find(runningExes.begin(), runningExes.end(), exe);
     if (iter == runningExes.end()) {
       continue;
     }
     // For compilers, such as me, mpl2mpl
-    exeOptions[exeName].push_back(option);
+    exeOptions[exe].push_back(option);
   }
   return kErrorNoError;
 }
@@ -664,17 +674,11 @@ std::string MplOptions::GetCommonOptionsStr() const {
   static DriverOptionIndex exclude[] = { kRun, kOption, kInFile, kMeOpt, kMpl2MplOpt, kMplcgOpt };
 
   std::string driverOptions;
-  auto it = exeOptions.find("all");
+  auto it = exeOptions.find("driver");
   if (it != exeOptions.end()) {
     for (const mapleOption::Option &opt : it->second) {
       if (!(std::find(std::begin(exclude), std::end(exclude), opt.Index()) != std::end(exclude))) {
-        std::string prefix;
-        if (opt.GetPrefixType() == mapleOption::shortOptPrefix) {
-          prefix = "-";
-        } else if (opt.GetPrefixType() == mapleOption::longOptPrefix) {
-          prefix = "--";
-        }
-
+        std::string prefix = opt.GetPrefix();
         auto connectSym = !opt.Args().empty() ? "=" : "";
         driverOptions += " " + prefix + opt.OptionKey() + connectSym + opt.Args();
       }
@@ -841,11 +845,12 @@ ErrorCode MplOptions::UpdatePhaseOption(const std::string &args, const std::stri
     LogInfo::MapleLogger(kLlErr) << "Cannot find phase " << exeName << '\n';
     return kErrorExit;
   }
-  std::vector<std::string> tmpArgs;
-  // Split options with ' '
-  StringUtils::Split(args, tmpArgs, ' ');
+
+  std::vector<Arg> inputArgs;
+  StringUtils::SplitSV(args, inputArgs, ' ');
+
   auto &exeOption = exeOptions[exeName];
-  ErrorCode ret = optionParser->HandleInputArgs(tmpArgs, exeName, exeOption);
+  ErrorCode ret = optionParser->HandleInputArgs(inputArgs, exeName, exeOption);
   if (ret != kErrorNoError) {
     return ret;
   }
@@ -949,7 +954,8 @@ void MplOptions::connectOptStr(std::string &optionStr, const std::string &exeNam
     auto it = exeOptions.find(exeName);
     for (const mapleOption::Option &opt : it->second) {
       connectSym = !opt.Args().empty() ? "=" : "";
-      optionStr += (" --" + opt.OptionKey() + connectSym + opt.Args());;
+      auto prefixStr = opt.GetPrefix();
+      optionStr += (" " + prefixStr + opt.OptionKey() + connectSym + opt.Args());
     }
   }
 }
diff --git a/src/mapleall/maple_driver/src/mplcg_compiler.cpp b/src/mapleall/maple_driver/src/mplcg_compiler.cpp
index 5291917d3ef8e836d4146cdd99f064ea22dfa6ae..6384fe3d0e2d1fb06eca05f2aebfc3e11c16571a 100644
--- a/src/mapleall/maple_driver/src/mplcg_compiler.cpp
+++ b/src/mapleall/maple_driver/src/mplcg_compiler.cpp
@@ -96,7 +96,8 @@ void MplcgCompiler::PrintMplcgCommand(const MplOptions &options, const Action &a
     }
     for (const mapleOption::Option &opt : it->second) {
       connectSym = !opt.Args().empty() ? "=" : "";
-      optionStr += (" --" + opt.OptionKey() + connectSym + opt.Args());
+      auto prefixStr = opt.GetPrefix();
+      optionStr += (" " + prefixStr + opt.OptionKey() + connectSym + opt.Args());
     }
   }
   optionStr += "\"";
diff --git a/src/mapleall/maple_driver/src/option_parser.cpp b/src/mapleall/maple_driver/src/option_parser.cpp
index 212f41c7c1c6c9b4ab7da60a783e5027c56d3204..c2f6802202f899f8d191a32aa14b69e1c53f9cac 100644
--- a/src/mapleall/maple_driver/src/option_parser.cpp
+++ b/src/mapleall/maple_driver/src/option_parser.cpp
@@ -16,12 +16,73 @@
 #include <regex>
 #include <iostream>
 #include <cstring>
+#include <string>
+#include <string_view>
+#include "error_code.h"
 #include "mpl_logging.h"
 #include "driver_option_common.h"
+#include "option_descriptor.h"
 
 using namespace maple;
 using namespace mapleOption;
 
+namespace mapleOption {
+
+static std::map<OptionPrefixType, std::string_view> prefixInfo = {
+  {shortOptPrefix, "-"},
+  {longOptPrefix, "--"},
+  {undefinedOpt, ""}
+};
+
+OptionPrefixType DetectOptPrefix(std::string_view opt) {
+  if (opt.substr(0, 2) == "--") {
+    return longOptPrefix;
+  } else if (opt.substr(0, 1) == "-") {
+    return shortOptPrefix;
+  } else {
+    return undefinedOpt;
+  }
+}
+
+/* NOTE: return value will be a part of input string_view */
+std::pair<maple::ErrorCode, std::string_view> ExtractKey(std::string_view opt,
+                                                         OptionPrefixType prefix) {
+  auto optStr = prefixInfo.find(prefix);
+  ASSERT(optStr != prefixInfo.end(), "Incorrect prefix");
+
+  size_t index = optStr->second.size();
+  if (opt.size() <= index) {
+    return std::make_pair(kErrorInvalidParameter, opt);
+  }
+
+  if (opt.substr(0, index) != optStr->second) {
+    return std::make_pair(kErrorInvalidParameter, opt);
+  }
+
+  auto key = opt.substr(index);
+  return {kErrorNoError, key};
+}
+
+}
+
+static bool IsOptionForCurrentTool(const Descriptor &desc, std::string_view exeName) {
+  if (desc.exeName == exeName) {
+    return true;
+  }
+
+  /* external tool can register options for the driver with "extras" field in the descriptor.
+   * As example: mplcg registers --omit-frame-pointer, --fpic and another options with this way.
+   * So if it can find "driver" in "extras", it's possible option for the driver.
+   */
+  auto &extra = desc.extras;
+  if (exeName == "driver" &&
+      (std::find(std::begin(extra), std::end(extra), exeName) != std::end(extra))) {
+    return true;
+  }
+
+  return false;
+}
+
 void OptionParser::InsertExtraUsage(const Descriptor &usage) {
   unsigned int index = 0;
   while (index < kMaxExtraOptions && index < usage.extras.size()) {
@@ -119,7 +180,14 @@ void OptionParser::RegisteUsages(const Descriptor usage[]) {
 
 void OptionParser::PrintUsage(const std::string &helpType, const uint32_t helpLevel) const {
   for (size_t i = 0; i < rawUsages.size(); ++i) {
-    if (rawUsages[i].help != "" && rawUsages[i].IsEnabledForCurrentBuild() && rawUsages[i].exeName == helpType) {
+
+    auto contains = [](const auto &container, const auto &data) {
+      return (std::find(std::begin(container), std::end(container), data) != container.end());
+    };
+    bool isOptionForCurrentTool = (rawUsages[i].exeName == helpType ||
+                                   (helpType == "driver" && contains(rawUsages[i].extras, helpType)));
+
+    if (rawUsages[i].help != "" && rawUsages[i].IsEnabledForCurrentBuild() && isOptionForCurrentTool) {
       if (helpLevel != kBuildTypeDefault &&
           (rawUsages[i].enableBuildType != helpLevel && rawUsages[i].enableBuildType != kBuildTypeAll)) {
         continue;
@@ -129,74 +197,62 @@ void OptionParser::PrintUsage(const std::string &helpType, const uint32_t helpLe
   }
 }
 
-bool OptionParser::CheckSpecialOption(const std::string &option, std::string &key, std::string &value) {
-  uint32_t index = 0;
-  std::string pattern;
-  if (strncmp(option.c_str(), "j", strlen("j")) == 0) {
-    pattern = "^j[0-9]+\\b";
-    index = strlen("j");
-  } else if (strncmp(option.c_str(), "maxid", strlen("maxid")) == 0) {
-    pattern = "^maxid.[0-9]+\\b";
-    index = strlen("maxid");
-  } else if (strncmp(option.c_str(), "minid", strlen("minid")) == 0) {
-    pattern = "^minid.[0-9]+\\b";
-    index = strlen("maxid");
-  }
-  if (index != 0) {
-    std::regex rx(pattern);
-    bool isMatched = std::regex_match(option.begin(), option.end(), rx);
-    if (isMatched) {
-      key = option.substr(0, index);
-      value = option.substr(index);
-      return true;
-    }
-  }
-  return false;
-}
+bool OptionParser::HandleKeyValue(const Arg &arg, std::deque<mapleOption::Option> &inputOption,
+                                  const std::string &exeName) {
+  auto &key = arg.key;
+  auto &value = arg.val;
 
-bool OptionParser::HandleKeyValue(const std::string &key, const std::string &value,
-                                  std::deque<mapleOption::Option> &inputOption, const std::string &exeName,
-                                  bool isAllOption, bool isEqualPrefix) {
   if (key.empty()) {
-    if (!isAllOption) {
-      LogInfo::MapleLogger(kLlErr) << "Cannot recognize " << value << '\n';
-      return false;
-    }
-    nonOptionsArgs.push_back(value);
-    return true;
+    LogInfo::MapleLogger(kLlErr) << "Cannot recognize " << value << '\n';
+    return false;
   }
+
   size_t count = usages.count(key);
   auto item = usages.find(key);
-  while (count > 0 && item->second.desc.exeName != exeName) {
+
+  /* Skip option if:
+   * 1. Prefix is not matched.
+   * 2. Option is registered for different tool. Descriptor.exeName shows a tool
+   *    registering for current option.
+   *    Special case: extras field in Descriptor allows to register an option in additional tool.
+   *    If extras exeName == driver name ("driver"), it means that this option
+   *    is registered outside the driver, but this option can be used by the driver.
+   *    It checks here too.
+   */
+
+  /* TODO: Add prefix type check (item->second.type != arg.prefixType) after CI tests reworking.
+   * CI tests must use correct prefixes. */
+  while (count > 0 && (IsOptionForCurrentTool(item->second.desc, exeName) != true)) {
     ++item;
     --count;
   }
   if (count == 0) {
-    LogInfo::MapleLogger(kLlErr) << ("Unknown Option: " + key) << '\n';
+    LogInfo::MapleLogger(kLlErr) << "Unknown Option: " << key << '\n';
     return false;
   }
   switch (item->second.desc.checkPolicy) {
     case kArgCheckPolicyUnknown:
-      LogInfo::MapleLogger(kLlErr) << ("Unknown option " + key) << '\n';
+      LogInfo::MapleLogger(kLlErr) << "Unknown option " << key << '\n';
       return false;
     case kArgCheckPolicyNone:
     case kArgCheckPolicyOptional:
       break;
     case kArgCheckPolicyRequired:
-      if (value.empty() && !isValueEmpty) {
-        LogInfo::MapleLogger(kLlErr) << ("Option " + key + " requires an argument.") << '\n';
+      if (value.empty()) {
+        LogInfo::MapleLogger(kLlErr) << "Option " << key << " requires an argument." << '\n';
         return false;
       }
       break;
     case kArgCheckPolicyNumeric:
       if (value.empty()) {
-        LogInfo::MapleLogger(kLlErr) << ("Option " + key + " requires an argument.") << '\n';
+        LogInfo::MapleLogger(kLlErr) << "Option " << key << " requires an argument." << '\n';
         return false;
       } else {
         std::regex rx("^(-|)[0-9]+\\b");
         bool isNumeric = std::regex_match(value.begin(), value.end(), rx);
         if (!isNumeric) {
-          LogInfo::MapleLogger(kLlErr) << ("Option " + key + " requires a numeric argument.") << '\n';
+          LogInfo::MapleLogger(kLlErr) << "Option " << key
+                                       << " requires a numeric argument." << '\n';
           return false;
         }
       }
@@ -204,27 +260,31 @@ bool OptionParser::HandleKeyValue(const std::string &key, const std::string &val
     default:
       break;
   }
-  inputOption.push_back(Option(item->second.desc, key, value,
-                               item->second.type, isEqualPrefix));
+  inputOption.emplace_back(item->second.desc, std::string(key), std::string(value),
+                           arg.prefixType, arg.isEqualOpt);
   return true;
 }
 
 bool OptionParser::SetOption(const std::string &rawKey, const std::string &value, const std::string &exeName,
                              std::deque<mapleOption::Option> &exeOption) {
-  constexpr char kOptionMark = '-';
+  /* TODO: This method looks almost identical to OptionParser::HandleKeyValue.
+   * So it's good idea to refactor it to use OptionParser::HandleKeyValue to reduce code duplication.
+   */
+
   if (rawKey.empty()) {
     LogInfo::MapleLogger(kLlErr) << "Invalid key" << '\n';
-    PrintUsage("all");
+    PrintUsage("driver");
     return false;
   }
-  int index = 0;
-  if (rawKey[0] == kOptionMark) {
-    ++index;
-    if (rawKey[1] == kOptionMark) {
-      ++index;
-    }
+
+  ErrorCode err;
+  std::string_view key;
+  auto prefixType = DetectOptPrefix(rawKey);
+  std::tie(err, key) = ExtractKey(rawKey, prefixType);
+  if (err != kErrorNoError) {
+    return false;
   }
-  std::string key = rawKey.substr(index);
+
   int count = usages.count(key);
   auto item = usages.find(key);
   while (count > 0) {
@@ -239,7 +299,7 @@ bool OptionParser::SetOption(const std::string &rawKey, const std::string &value
         break;
       case kArgCheckPolicyRequired:
         if (value.empty()) {
-          LogInfo::MapleLogger(kLlErr) << ("Option " + key + " requires an argument.") << '\n';
+          LogInfo::MapleLogger(kLlErr) << "Option " << key << " requires an argument." << '\n';
           return false;
         }
         break;
@@ -248,127 +308,127 @@ bool OptionParser::SetOption(const std::string &rawKey, const std::string &value
     }
     break;
   }
-  exeOption.emplace_front(item->second.desc, key, value);
+  exeOption.emplace_front(item->second.desc, std::string(key), value, prefixType, false);
   return true;
 }
 
-bool OptionParser::CheckJoinedOption(const std::string &option,
+bool OptionParser::CheckJoinedOption(Arg &arg,
                                      std::deque<mapleOption::Option> &inputOption,
                                      const std::string &exeName) {
+  auto &option = arg.key;
+
   /* TODO: Add special field in Descriptor to check only joined usages */
   for (auto usage : usages) {
     /* Joined Option (like -DMACRO) can be detected as substring (-D) in the option string */
     if (option.find(usage.first) == 0) {
-      return HandleKeyValue(option.substr(0, std::strlen(usage.first.c_str())),
-                            option.substr(strlen(usage.first.c_str())),
-                            inputOption, exeName);
+      arg.val = option.substr(usage.first.size());
+      arg.key = option.substr(0, usage.first.size());
+      return HandleKeyValue(arg, inputOption, exeName);
     }
   }
 
-  LogInfo::MapleLogger(kLlErr) << ("Unknown Option: " + option) << '\n';
+  LogInfo::MapleLogger(kLlErr) << "Unknown Option: " << arg.rawArg << '\n';
   return false;
 }
 
-
-bool OptionParser::CheckOpt(const std::string option, std::string &lastKey,
-                            bool &isLastMatch, std::deque<mapleOption::Option> &inputOption,
+bool OptionParser::CheckOpt(std::vector<Arg> &inputArgs, size_t &argsIndex,
+                            std::deque<mapleOption::Option> &inputOption,
                             const std::string &exeName) {
-  std::vector<std::string> temps;
-  // check -j100, -maxid, -minid
-  if (exeName == "dex2mpl") {
-    std::string key;
-    std::string value;
-    bool isMatched = CheckSpecialOption(option, key, value);
-    if (isMatched) {
-      isValueEmpty = value.empty();
-      return HandleKeyValue(key, value, inputOption, exeName);
-    }
-  }
+  ASSERT(argsIndex < inputArgs.size(), "Incorrect argsIndex in OptionParser::CheckOpt");
+  auto &arg = inputArgs[argsIndex];
+  auto &option = arg.key;
+
   size_t pos = option.find('=');
   if (pos != std::string::npos) {
     /* option like --key=value */
     ASSERT(pos > 0, "option should not begin with symbol '='");
-    isLastMatch = false;
-    std::string key = option.substr(0, pos);
-    std::string value = option.substr(pos + 1);
+    arg.isEqualOpt = true;
 
-    auto item = usages.find(key);
+    /* To handle joined option, we must have full (not splitted key),
+     * because joined option splitting is different:
+     * As example for -Dkey=value: default splitting key="Dkey" value="value",
+     * Joined option splitting key="D" value="key=value"
+     */
+    std::string_view tmpKey = option.substr(0, pos);
+    auto item = usages.find(tmpKey);
     if (item == usages.end()) {
       /* It can be joined option, like: -DMACRO=VALUE */
-      return CheckJoinedOption(option, inputOption, exeName);
+      argsIndex++;
+      return CheckJoinedOption(arg, inputOption, exeName);
     }
 
-    isValueEmpty = value.empty();
-    return HandleKeyValue(key, value, inputOption, exeName,
-                          false /* isAllOption */,
-                          true /* isEqualPrefix */);
-  } else {
+    arg.val = option.substr(pos + 1);
+    arg.key = tmpKey;
+
+    argsIndex++;
+    return HandleKeyValue(arg, inputOption, exeName);
+  }
+
+  /* option like "--key value" or "--key" */
+  else {
     auto item = usages.find(option);
     if (item != usages.end()) {
       if (item->second.desc.checkPolicy == kArgCheckPolicyRequired ||
           item->second.desc.checkPolicy == kArgCheckPolicyNumeric) {
-        /* option contains key and value: --key value. key is saved
-         * in lastKey, key will be handled in HandleInputArgs as second argument
-         */
-        lastKey = option;
-        isLastMatch = true;
-      } else {
-        /* option does not contain a value (only key) */
-        isValueEmpty = false;
-        return HandleKeyValue(option, "", inputOption, exeName);
+        /* option like "--key value", so we need to check value as next argument */
+        argsIndex++;
+        if (argsIndex >= inputArgs.size() ||
+            inputArgs[argsIndex].rawArg.empty()) {
+          /* Something wrong: Value is missed */
+          LogInfo::MapleLogger(kLlErr) << "Last option must be a value for option: " << option << '\n';
+          return false;
+        }
+
+        arg.val = inputArgs[argsIndex].rawArg;
+        /* Check: option like "--key value", so "value" must not contain any prefix (--value is incorrect) */
+        auto prefixType = DetectOptPrefix(arg.val);
+        if (prefixType != undefinedOpt) {
+          LogInfo::MapleLogger(kLlErr) << "Incorrect value=" << arg.val << " for option=" << option << '\n';
+          return false;
+        }
       }
+
+      argsIndex++;
+      return HandleKeyValue(arg, inputOption, exeName);
     } else {
       /* It can be joined option, like: -DMACRO */
-      return CheckJoinedOption(option, inputOption, exeName);;
+      argsIndex++;
+      return CheckJoinedOption(arg, inputOption, exeName);;
     }
   }
   return true;
 }
 
-ErrorCode OptionParser::HandleInputArgs(const std::vector<std::string> &inputArgs, const std::string &exeName,
+ErrorCode OptionParser::HandleInputArgs(std::vector<Arg> &inputArgs, const std::string &exeName,
                                         std::deque<mapleOption::Option> &inputOption, bool isAllOption) {
-  bool isLastMatchOpt = false;
-  std::string lastKey = "";
-  bool ret = true;
-  for (size_t i = 0; i < inputArgs.size(); ++i) {
-    if (inputArgs[i] == "") {
+  ErrorCode ret = kErrorNoError;
+  for (size_t argsIndex = 0; argsIndex < inputArgs.size();) {
+    auto &arg = inputArgs[argsIndex];
+    auto &rawArg = arg.rawArg;
+    if (rawArg == "") {
+      argsIndex++;
       continue;
     }
-    bool isMatchLongOpt = false;
-    bool isMatchShortOpt = false;
-    MatchedIndex index = kMatchNone;
-    if (inputArgs[i][0] == '-') {
-      index = kMatchShortOpt;
-      if (inputArgs[i][1] == '-') {
-        index = kMatchLongOpt;
-      }
-    }
-    if (index == kMatchShortOpt) {
-      isMatchShortOpt = true;
-    } else if (index == kMatchLongOpt) {
-      isMatchLongOpt = true;
+
+    arg.prefixType = DetectOptPrefix(rawArg);
+    std::tie(ret, arg.key) = ExtractKey(rawArg, arg.prefixType);
+    if (ret != kErrorNoError) {
+      return ret;
     }
-    std::string arg = inputArgs[i].substr(index);
-    bool isOptMatched = (isMatchLongOpt || isMatchShortOpt);
-    if (!isLastMatchOpt && isOptMatched) {
-      ret = CheckOpt(arg, lastKey, isLastMatchOpt, inputOption, exeName);
-    } else if (isLastMatchOpt && !isOptMatched) {
-      isLastMatchOpt = false;
-      isValueEmpty = false;
-      ret = HandleKeyValue(lastKey, arg, inputOption, exeName, isAllOption);
-    } else if (isLastMatchOpt && isOptMatched) {
-      LogInfo::MapleLogger(kLlErr) << ("Unknown Option: " + arg) << '\n';
-      return kErrorInvalidParameter;
+
+    if (arg.prefixType != undefinedOpt) {
+      /* options prefix is matched -> Try to detect and handle the option */
+      bool wasOptHandled = CheckOpt(inputArgs, argsIndex, inputOption, exeName);
+      if (!wasOptHandled) {
+        LogInfo::MapleLogger(kLlErr) << "Unknown Option: " << arg.rawArg << '\n';
+        return kErrorInvalidParameter;
+      }
     } else {
-      isValueEmpty = false;
-      ret = HandleKeyValue("", arg, inputOption, exeName, isAllOption);
-    }
-    if (i == inputArgs.size() - 1 && isLastMatchOpt) {
-      LogInfo::MapleLogger(kLlErr) << ("Option " + lastKey + " requires an argument.") << '\n';
-      return kErrorInvalidParameter;
-    }
-    if (!ret) {
-      return kErrorInvalidParameter;
+      /* if it's not an option, it can be input file */
+      argsIndex++;
+      if (isAllOption) {
+        nonOptionsArgs.emplace_back(arg.key);
+      }
     }
   }
   return kErrorNoError;
@@ -385,12 +445,18 @@ ErrorCode OptionParser::Parse(int argc, char **argv, const std::string exeName)
     return kErrorInitFail;
   }
   // transform char* to string
-  std::vector<std::string> inputArgs;
+  std::vector<Arg> inputArgs;
   while (argc != 0 && *argv != nullptr) {
-    inputArgs.push_back(*argv);
+    inputArgs.emplace_back(*argv);
     ++argv;
     --argc;
   }
   ErrorCode ret = HandleInputArgs(inputArgs, exeName, options, true);
   return ret;
 }
+
+std::string Option::GetPrefix() const {
+  auto it = prefixInfo.find(prefixType);
+  ASSERT(it != prefixInfo.end(), "Prefix must be initialized!!");
+  return std::string(it->second);
+}
diff --git a/src/mapleall/maple_ir/src/option.cpp b/src/mapleall/maple_ir/src/option.cpp
index 87f0ab95761161a250718bae8ce4dcccbbabd11b..92a537a446c4b1cfdd29428832ada2ebcbfb7530 100644
--- a/src/mapleall/maple_ir/src/option.cpp
+++ b/src/mapleall/maple_ir/src/option.cpp
@@ -526,8 +526,8 @@ const Descriptor kUsage[] = {
     {} },
   { kMpl2MplOptL0,
     0,
-    "",
     "O0",
+    "",
     kBuildTypeProduct,
     kArgCheckPolicyOptional,
     "  -O0                         \tDo some optimization.\n",
@@ -535,8 +535,8 @@ const Descriptor kUsage[] = {
     {} },
   { kMpl2MplOptL2,
     0,
-    "",
     "O2",
+    "",
     kBuildTypeProduct,
     kArgCheckPolicyOptional,
     "  -O2                         \tDo some optimization.\n",
diff --git a/src/mapleall/maple_me/src/me_option.cpp b/src/mapleall/maple_me/src/me_option.cpp
index 56fefb5f53bfd1658435d87250657a8ebc104c0b..be8120cc6ba6bb5f6489282b55a82fc0ddfd9eee 100644
--- a/src/mapleall/maple_me/src/me_option.cpp
+++ b/src/mapleall/maple_me/src/me_option.cpp
@@ -273,8 +273,8 @@ const Descriptor kUsage[] = {
     {} },
   { kMeOptL1,
     0,
-    "",
     "O1",
+    "",
     kBuildTypeProduct,
     kArgCheckPolicyOptional,
     "  -O1                         \tDo some optimization.\n",
@@ -282,8 +282,8 @@ const Descriptor kUsage[] = {
     {} },
   { kMeOptL2,
     0,
-    "",
     "O2",
+    "",
     kBuildTypeProduct,
     kArgCheckPolicyOptional,
     "  -O2                         \tDo some optimization.\n",
@@ -291,8 +291,8 @@ const Descriptor kUsage[] = {
     {} },
   { kMeOptL3,
     0,
-    "",
     "O3",
+    "",
     kBuildTypeProduct,
     kArgCheckPolicyOptional,
     "  -O3                         \tDo aggressive optimizations.\n",
diff --git a/src/mapleall/maple_util/include/string_utils.h b/src/mapleall/maple_util/include/string_utils.h
index 83b5e60222010bd8f3a4310317dd85edc72d1969..f058f65cc7c5ea56e089cdbd1d0d9de927bde7c0 100644
--- a/src/mapleall/maple_util/include/string_utils.h
+++ b/src/mapleall/maple_util/include/string_utils.h
@@ -36,6 +36,27 @@ class StringUtils {
     }
   }
 
+  template <typename Container>
+  static void SplitSV(std::string_view src, Container &container, char delim) {
+    size_t startInd = 0;
+    while (startInd < src.size()) {
+      if(src[startInd] == delim) {
+        ++startInd;
+        continue;
+      }
+
+      size_t endInd = src.find_first_of(delim, startInd);
+      if (startInd != endInd) {
+        container.emplace_back(src.substr(startInd,  endInd - startInd));
+      }
+
+      if (endInd == std::string_view::npos) {
+        break;
+      }
+      startInd = endInd + 1;
+    }
+  }
+
   static void Split(const std::string &src, std::unordered_set<std::string> &container, char delim);
 
   static std::string Trim(const std::string &s);
diff --git a/testsuite/driver/src/api/hir2mpl.py b/testsuite/driver/src/api/hir2mpl.py
index 951b93fa10439dc2117b3f8a6c1a88ec22e30759..346bca9652c1a8136c40ec8ab0f6e1b8ecdec037 100755
--- a/testsuite/driver/src/api/hir2mpl.py
+++ b/testsuite/driver/src/api/hir2mpl.py
@@ -17,7 +17,7 @@ from api.shell_operator import ShellOperator
 
 class Hir2mpl(ShellOperator):
 
-    def __init__(self, hir2mpl, infile, outfile, option="-enable-variable-array", return_value_list=None, redirection=None):
+    def __init__(self, hir2mpl, infile, outfile, option="--enable-variable-array", return_value_list=None, redirection=None):
         super().__init__(return_value_list, redirection)
         self.hir2mpl = hir2mpl
         self.infile = infile