diff --git a/src/bot/main.cpp b/src/bot/main.cpp
index 1e4e7c0..623f3d1 100644
--- a/src/bot/main.cpp
+++ b/src/bot/main.cpp
@@ -24,7 +24,7 @@
 int main(int argc, char** argv) {
 	jessilib::app_parameters parameters{ argc, argv };
 
-	if (parameters.hasSwitch("echoParameters")) {
+	if (parameters.has_switch("echoParameters")) {
 		// TODO: Write pretty JSON serializer based on JSON serializer
 		std::cout << std::endl << jessilib::json_parser{}.serialize(parameters) << std::endl;
 	}
diff --git a/src/common/app_parameters.cpp b/src/common/app_parameters.cpp
index 321d970..4dfa9d8 100644
--- a/src/common/app_parameters.cpp
+++ b/src/common/app_parameters.cpp
@@ -130,16 +130,16 @@ object app_parameters::as_object() const {
 	};
 }
 
-bool app_parameters::hasSwitch(std::string_view in_switch) const {
+bool app_parameters::has_switch(std::string_view in_switch) const {
 	return m_switches_set.find(in_switch) != m_switches_set.end();
 }
 
-std::string_view app_parameters::getValue(std::string_view in_key) const {
+std::string_view app_parameters::get_value(std::string_view in_key, std::string_view in_default) const {
 	auto result = m_values.find(in_key);
 
 	// Safety check
 	if (result == m_values.end()) {
-		return {};
+		return in_default;
 	}
 
 	return result->second;
diff --git a/src/include/jessilib/app_parameters.hpp b/src/include/jessilib/app_parameters.hpp
index 21c9ebc..912c12e 100644
--- a/src/include/jessilib/app_parameters.hpp
+++ b/src/include/jessilib/app_parameters.hpp
@@ -32,8 +32,8 @@ public:
 	const std::unordered_map<std::string_view, std::string>& values() const;
 	jessilib::object as_object() const;
 
-	bool hasSwitch(std::string_view in_switch) const;
-	std::string_view getValue(std::string_view in_key) const;
+	bool has_switch(std::string_view in_switch) const;
+	std::string_view get_value(std::string_view in_key, std::string_view in_default = {}) const;
 
 	operator jessilib::object() const { return as_object(); }
 
diff --git a/src/include/jessilib/split.hpp b/src/include/jessilib/split.hpp
index 81f83c9..d200b09 100644
--- a/src/include/jessilib/split.hpp
+++ b/src/include/jessilib/split.hpp
@@ -27,6 +27,7 @@
 
 #include <string_view>
 #include <vector>
+#include <tuple>
 
 namespace jessilib {
 
diff --git a/src/include/jessilib/word_split.hpp b/src/include/jessilib/word_split.hpp
index 433e57b..310fe10 100644
--- a/src/include/jessilib/word_split.hpp
+++ b/src/include/jessilib/word_split.hpp
@@ -27,6 +27,7 @@
 
 #include <string_view>
 #include <vector>
+#include <tuple>
 
 namespace jessilib {