diff --git a/navicat-keygen/CollectInformation.cpp b/navicat-keygen/CollectInformation.cpp
index 2e836dc..0d2c7ca 100644
--- a/navicat-keygen/CollectInformation.cpp
+++ b/navicat-keygen/CollectInformation.cpp
@@ -75,8 +75,10 @@ namespace nkg {
         std::wcout << L" 7. MariaDB"                    << std::endl;
         std::wcout << L" 8. MongoDB"                    << std::endl;
         std::wcout << L" 9. ReportViewer"               << std::endl;
+        std::wcout << L" 10. ChartsCreator"             << std::endl;
+        std::wcout << L" 11. ChartsViewer"              << std::endl;
         std::wcout << std::endl;
-        sn_generator.set_software_type(static_cast<navicat_software_type>(read_int(0, 9, L"(Input index)> ", L"Invalid index.")));
+        sn_generator.set_software_type(static_cast<navicat_software_type>(read_int(0, 11, L"(Input index)> ", L"Invalid index.")));
         std::wcout << std::endl;
 
         std::wcout << L"[*] Select product language:"   << std::endl;
@@ -96,7 +98,7 @@ namespace nkg {
         std::wcout << std::endl;
 
         std::wcout << L"[*] Input major version number:" << std::endl;
-        sn_generator.set_software_version(read_int(11, 16, 16, L"(range: 11 ~ 16, default: 16)> ", L"Invalid number."));
+        sn_generator.set_software_version(read_int(1, 16, 16, L"(range: 1 ~ 16, default: 16)> ", L"Invalid number."));
         std::wcout << std::endl;
 
         return sn_generator;
@@ -120,7 +122,7 @@ namespace nkg {
         std::wcout << std::endl;
 
         std::wcout << L"[*] Input major version number:" << std::endl;
-        sn_generator.set_software_version(read_int(11, 16, 16, L"(range: 11 ~ 16, default: 16)> ", L"Invalid number."));
+        sn_generator.set_software_version(read_int(1, 16, 16, L"(range: 1 ~ 16, default: 16)> ", L"Invalid number."));
         std::wcout << std::endl;
 
         return sn_generator;
diff --git a/navicat-keygen/navicat_serial_generator.cpp b/navicat-keygen/navicat_serial_generator.cpp
index f808845..267273b 100644
--- a/navicat-keygen/navicat_serial_generator.cpp
+++ b/navicat-keygen/navicat_serial_generator.cpp
@@ -119,6 +119,12 @@ namespace nkg {
             case navicat_software_type::ReportViewer:
                 m_data[7] = 0xb;
                 break;
+            case navicat_software_type::ChartsCreator:
+                m_data[7] = 0x86;
+                break;
+            case navicat_software_type::ChartsViewer:
+                m_data[7] = 0x88;
+                break;
             default:
                 break;
         }
@@ -129,7 +135,7 @@ namespace nkg {
     }
 
     void navicat_serial_generator::set_software_version(int ver) {
-        if (11 <= ver && ver < 16) {
+        if (1 <= ver && ver < 16) {
             static_assert(sizeof(m_des_key) == sizeof(s_des_key0));
 
             m_data[8] = static_cast<std::uint8_t>((ver << 4) | (m_data[8] & 0x0f));
diff --git a/navicat-keygen/navicat_serial_generator.hpp b/navicat-keygen/navicat_serial_generator.hpp
index 07b0847..da6fda1 100644
--- a/navicat-keygen/navicat_serial_generator.hpp
+++ b/navicat-keygen/navicat_serial_generator.hpp
@@ -29,7 +29,9 @@ namespace nkg {
         SQLite,
         MariaDB,
         MongoDB,
-        ReportViewer
+        ReportViewer,
+        ChartsCreator,
+        ChartsViewer
     };
 
     class navicat_serial_generator {