1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/cuchaz/enigma/EnigmaServices.java b/src/main/java/cuchaz/enigma/EnigmaServices.java
index 86507bc..45062d7 100644
--- a/src/main/java/cuchaz/enigma/EnigmaServices.java
+++ b/src/main/java/cuchaz/enigma/EnigmaServices.java
@@ -1,21 +1,21 @@
 package cuchaz.enigma;
 
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableListMultimap;
 import cuchaz.enigma.api.service.EnigmaService;
 import cuchaz.enigma.api.service.EnigmaServiceType;
 
-import java.util.Optional;
+import java.util.Collections;
+import java.util.List;
 
 public final class EnigmaServices {
-        private final ImmutableMap<EnigmaServiceType<?>, EnigmaService> services;
+        private final ImmutableListMultimap<EnigmaServiceType<?>, EnigmaService> services;
 
-        EnigmaServices(ImmutableMap<EnigmaServiceType<?>, EnigmaService> services) {
+        EnigmaServices(ImmutableListMultimap<EnigmaServiceType<?>, EnigmaService> services) {
                 this.services = services;
         }
 
         @SuppressWarnings("unchecked")
-        public <T extends EnigmaService> Optional<T> get(EnigmaServiceType<T> type) {
-                EnigmaService service = services.get(type);
-                return Optional.ofNullable((T) service);
+        public <T extends EnigmaService> List<T> get(EnigmaServiceType<T> type) {
+                return (List<T>) services.get(type);
         }
 }