diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs
index 2ce7c5517..3ecd77c1d 100644
--- a/src/Discord.Net.Commands/CommandService.cs
+++ b/src/Discord.Net.Commands/CommandService.cs
@@ -16,8 +16,7 @@ namespace Discord.Commands
         private readonly ConcurrentDictionary<Type, TypeReader> _typeReaders;
         private readonly CommandMap _map;
 
-        public IEnumerable<Module> Modules => _modules.Select(x => x.Value);
-        public IEnumerable<Command> Commands => _modules.SelectMany(x => x.Value.Commands);
+        public ILookup<Module, Command> Commands => _modules.SelectMany(x => x.Value.Commands).ToLookup(x => x.Module);
 
         public CommandService()
         {