diff --git a/ChaosBot/Database/Repository/ConfigurationRepository.cs b/ChaosBot/Database/Repository/ConfigurationRepository.cs
index c763b1b..ce942b1 100644
--- a/ChaosBot/Database/Repository/ConfigurationRepository.cs
+++ b/ChaosBot/Database/Repository/ConfigurationRepository.cs
@@ -13,6 +13,16 @@ namespace ChaosBot.Database.Repository
             return AppSettingsHandler.GetValue<T>(configurationFlag);
         }
 
+        public static T GetValue<T>(string configurationFlag, ulong guildId)
+        {
+            return AppSettingsHandler.GetValue<T>($"Servers:{guildId}:{configurationFlag}");
+        }
+
+        public static T SetValue<T>(string configurationFlag, T value)
+        {
+            return AppSettingsHandler.GetValue<T>(configurationFlag);
+        }
+
         public static IConfigurationSection GetSection(string configurationFlag)
         {
             return AppSettingsHandler.GetSection(configurationFlag);
diff --git a/ChaosBot/Discord/Modules/RaffleSystem.cs b/ChaosBot/Discord/Modules/RaffleSystem.cs
index c38930c..e589429 100644
--- a/ChaosBot/Discord/Modules/RaffleSystem.cs
+++ b/ChaosBot/Discord/Modules/RaffleSystem.cs
@@ -59,12 +59,12 @@ namespace ChaosBot.Discord.Modules
         [RequireUserPermission(GuildPermission.ManageGuild)]
         public async Task RaffleCommandAdd(string user, int amount = 1)
         {
-            if (ConfigurationRepository.GetValue<int>($"Servers:{Context.Guild.Id}:Raffle:Max") >= amount)
+            if (ConfigurationRepository.GetValue<int>($"Raffle:Max", Context.Guild.Id) >= amount)
                 await RaffleCommandHelper("add", user, amount);
             else
             {
                 await ReplyAsync(
-                    $"You cannot give more then {ConfigurationRepository.GetValue<int>($"Servers:{Context.Guild.Id}:Raffle:Max").ToString()} tickets at a time", false);
+                    $"You cannot give more then {ConfigurationRepository.GetValue<int>($"Raffle:Max", Context.Guild.Id).ToString()} tickets at a time", false);
                 _logger.Warn($"{Context.User.Username} attempted to give {amount} tickets to {user}!");
             }
         }