diff --git a/src/Base/Entry.cpp b/src/Base/Entry.cpp
index 930db95..5a61364 100644
--- a/src/Base/Entry.cpp
+++ b/src/Base/Entry.cpp
@@ -1,5 +1,5 @@
-#include "../../settings.hpp"
 #include "../CommandManagement.cpp"
+#include "../Common.hpp"
 #include "../Databases.hpp"
 
 #include <cstdlib>
diff --git a/src/CommandManagement.cpp b/src/CommandManagement.cpp
index 9477e03..eb03e18 100644
--- a/src/CommandManagement.cpp
+++ b/src/CommandManagement.cpp
@@ -1,12 +1,10 @@
-#include "../settings.hpp"
+#include "Common.hpp"
 #include <dpp/appcommand.h>
 #include <dpp/cluster.h>
 #include <dpp/dispatcher.h>
 #include <vector>
 
-extern std::unordered_map<
-    std::string,
-    std::function<void(const dpp::slashcommand_t &event, dpp::cluster &bot)>>
+extern std::unordered_map<std::string, std::function<void(COMMAND_ARGS)>>
     Commands;
 
 void deleteCommands(const dpp::ready_t &event, dpp::cluster &bot) {
diff --git a/src/Commands.cpp b/src/Commands.cpp
index 2348145..5c05b7b 100644
--- a/src/Commands.cpp
+++ b/src/Commands.cpp
@@ -4,16 +4,14 @@
 #include "Commands/OtherCommands.cpp"
 
 // Registry
-std::unordered_map<
-    std::string,
-    std::function<void(const dpp::slashcommand_t &event, dpp::cluster &bot)>>
-    Commands{{COMMAND_PING, commandPing},
-             {COMMAND_ABOUT, commandAbout},
-             {COMMAND_BALANCE, commandBalance},
-             {COMMAND_BALANCE_SHORT, commandBalance},
-             {COMMAND_PAY, commandPay},
-             {COMMAND_PRINT_MONEY, commandPrintMoney},
-             {COMMAND_BURN_MONEY, commandBurnMoney},
-             {COMMAND_MONEY_LEADERBOARD, commandMoneyLeaderboard},
-             {COMMAND_GET_PFP, commandGetPFP},
-             {COMMAND_GENERATE_REPORT, commandGenerateReport}};
+std::unordered_map<std::string, std::function<void(COMMAND_ARGS)>> Commands{
+    {COMMAND_PING, commandPing},
+    {COMMAND_ABOUT, commandAbout},
+    {COMMAND_BALANCE, commandBalance},
+    {COMMAND_BALANCE_SHORT, commandBalance},
+    {COMMAND_PAY, commandPay},
+    {COMMAND_PRINT_MONEY, commandPrintMoney},
+    {COMMAND_BURN_MONEY, commandBurnMoney},
+    {COMMAND_MONEY_LEADERBOARD, commandMoneyLeaderboard},
+    {COMMAND_GET_PFP, commandGetPFP},
+    {COMMAND_GENERATE_REPORT, commandGenerateReport}};
diff --git a/src/Commands/GenerativeCommands.cpp b/src/Commands/GenerativeCommands.cpp
index 2d06582..de73e59 100644
--- a/src/Commands/GenerativeCommands.cpp
+++ b/src/Commands/GenerativeCommands.cpp
@@ -1,4 +1,5 @@
-#include "../../settings.hpp"
+#include "../Common.hpp"
+
 #include <dpp/dispatcher.h>
 #include <dpp/dpp.h>
 #include <dpp/guild.h>
diff --git a/src/Commands/MoneyCommands.cpp b/src/Commands/MoneyCommands.cpp
index afbf9f9..7d56e18 100644
--- a/src/Commands/MoneyCommands.cpp
+++ b/src/Commands/MoneyCommands.cpp
@@ -1,5 +1,5 @@
-#include "../../settings.hpp" // This is where language is imported
 #include "../Base/SQL.hpp"
+#include "../Common.hpp"
 #include "TransactionMethods.hpp"
 
 #include <dpp/appcommand.h>
diff --git a/src/Commands/OtherCommands.cpp b/src/Commands/OtherCommands.cpp
index 1077702..1f2850f 100644
--- a/src/Commands/OtherCommands.cpp
+++ b/src/Commands/OtherCommands.cpp
@@ -1,4 +1,4 @@
-#include "../../settings.hpp"
+#include "../Common.hpp"
 #include <dpp/dispatcher.h>
 #include <dpp/dpp.h>
 #include <dpp/guild.h>
diff --git a/src/Common.hpp b/src/Common.hpp
new file mode 100644
index 0000000..f775c3f
--- /dev/null
+++ b/src/Common.hpp
@@ -0,0 +1,6 @@
+#include "../settings.hpp"
+
+#define COMMAND_ARGS const dpp::slashcommand_t &event, dpp::cluster &bot
+
+// Costs of commands
+#define COMMAND_GENERATE_REPORT_COST 2
diff --git a/src/Cost.hpp b/src/Cost.hpp
deleted file mode 100644
index bd695ee..0000000
--- a/src/Cost.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#define COMMAND_GENERATE_REPORT_COST 2