diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 920eecb..bf4cb66 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sat Jun 20 16:01:15 PDT 2015
+#Fri Jul 03 06:22:44 EEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/intake-example/src/main/java/com/sk89q/intake/example/parametric/module/BodyProvider.java b/intake-example/src/main/java/com/sk89q/intake/example/parametric/module/BodyProvider.java
index 1bdbbde..e73777e 100644
--- a/intake-example/src/main/java/com/sk89q/intake/example/parametric/module/BodyProvider.java
+++ b/intake-example/src/main/java/com/sk89q/intake/example/parametric/module/BodyProvider.java
@@ -58,7 +58,7 @@ public Body get(CommandArgs arguments, List<? extends Annotation> modifiers) thr
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return ImmutableList.copyOf(universe.getPrefixedWith(prefix).keySet());
     }
 }
diff --git a/intake-example/src/main/java/com/sk89q/intake/example/sender/SenderProvider.java b/intake-example/src/main/java/com/sk89q/intake/example/sender/SenderProvider.java
index 7107778..1f34d26 100644
--- a/intake-example/src/main/java/com/sk89q/intake/example/sender/SenderProvider.java
+++ b/intake-example/src/main/java/com/sk89q/intake/example/sender/SenderProvider.java
@@ -48,7 +48,7 @@ public User get(CommandArgs arguments, List<? extends Annotation> modifiers) thr
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return ImmutableList.of();
     }
 
diff --git a/intake-example/src/main/java/com/sk89q/intake/example/sender/UserProvider.java b/intake-example/src/main/java/com/sk89q/intake/example/sender/UserProvider.java
index 2dd4b68..0b2ee76 100644
--- a/intake-example/src/main/java/com/sk89q/intake/example/sender/UserProvider.java
+++ b/intake-example/src/main/java/com/sk89q/intake/example/sender/UserProvider.java
@@ -56,7 +56,7 @@ public User get(CommandArgs arguments, List<? extends Annotation> modifiers) thr
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return ImmutableList.of();
     }
 
diff --git a/intake/src/main/java/com/sk89q/intake/internal/parametric/ConstantProvider.java b/intake/src/main/java/com/sk89q/intake/internal/parametric/ConstantProvider.java
index e2c4fa1..665e426 100644
--- a/intake/src/main/java/com/sk89q/intake/internal/parametric/ConstantProvider.java
+++ b/intake/src/main/java/com/sk89q/intake/internal/parametric/ConstantProvider.java
@@ -47,7 +47,7 @@ public T get(CommandArgs arguments, List<? extends Annotation> modifiers) {
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return Collections.emptyList();
     }
 
diff --git a/intake/src/main/java/com/sk89q/intake/parametric/Provider.java b/intake/src/main/java/com/sk89q/intake/parametric/Provider.java
index 48a8b09..6668e3f 100644
--- a/intake/src/main/java/com/sk89q/intake/parametric/Provider.java
+++ b/intake/src/main/java/com/sk89q/intake/parametric/Provider.java
@@ -60,9 +60,11 @@ public interface Provider<T> {
      * <p>If no suggestions could be enumerated, an empty list should
      * be returned.</p>
      *
+     * @param arguments The arguments
+     * @param modifiers The modifiers on the parameter
      * @param prefix What the user has typed so far (may be an empty string)
      * @return A list of suggestions
      */
-    List<String> getSuggestions(String prefix);
+    List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix);
 
 }
diff --git a/intake/src/main/java/com/sk89q/intake/parametric/provider/BooleanProvider.java b/intake/src/main/java/com/sk89q/intake/parametric/provider/BooleanProvider.java
index c7312d6..02821d4 100644
--- a/intake/src/main/java/com/sk89q/intake/parametric/provider/BooleanProvider.java
+++ b/intake/src/main/java/com/sk89q/intake/parametric/provider/BooleanProvider.java
@@ -44,7 +44,7 @@ public Boolean get(CommandArgs arguments, List<? extends Annotation> modifiers)
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return Collections.emptyList();
     }
 
diff --git a/intake/src/main/java/com/sk89q/intake/parametric/provider/CommandArgsProvider.java b/intake/src/main/java/com/sk89q/intake/parametric/provider/CommandArgsProvider.java
index cb37c27..b746619 100644
--- a/intake/src/main/java/com/sk89q/intake/parametric/provider/CommandArgsProvider.java
+++ b/intake/src/main/java/com/sk89q/intake/parametric/provider/CommandArgsProvider.java
@@ -49,7 +49,7 @@ public CommandArgs get(CommandArgs arguments, List<? extends Annotation> modifie
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return ImmutableList.of();
     }
 
diff --git a/intake/src/main/java/com/sk89q/intake/parametric/provider/EnumProvider.java b/intake/src/main/java/com/sk89q/intake/parametric/provider/EnumProvider.java
index 4b3c556..a4faea4 100644
--- a/intake/src/main/java/com/sk89q/intake/parametric/provider/EnumProvider.java
+++ b/intake/src/main/java/com/sk89q/intake/parametric/provider/EnumProvider.java
@@ -78,7 +78,7 @@ public T get(CommandArgs arguments, List<? extends Annotation> modifiers) throws
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         List<String> suggestions = Lists.newArrayList();
         String test = simplify(prefix);
 
diff --git a/intake/src/main/java/com/sk89q/intake/parametric/provider/NumberProvider.java b/intake/src/main/java/com/sk89q/intake/parametric/provider/NumberProvider.java
index 3f075bb..5975825 100644
--- a/intake/src/main/java/com/sk89q/intake/parametric/provider/NumberProvider.java
+++ b/intake/src/main/java/com/sk89q/intake/parametric/provider/NumberProvider.java
@@ -20,6 +20,7 @@
 package com.sk89q.intake.parametric.provider;
 
 import com.sk89q.intake.argument.ArgumentParseException;
+import com.sk89q.intake.argument.CommandArgs;
 import com.sk89q.intake.parametric.Provider;
 import com.sk89q.intake.parametric.annotation.Range;
 
@@ -36,7 +37,7 @@ public boolean isProvided() {
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return Collections.emptyList();
     }
 
diff --git a/intake/src/main/java/com/sk89q/intake/parametric/provider/StringProvider.java b/intake/src/main/java/com/sk89q/intake/parametric/provider/StringProvider.java
index 48a299e..be931ef 100644
--- a/intake/src/main/java/com/sk89q/intake/parametric/provider/StringProvider.java
+++ b/intake/src/main/java/com/sk89q/intake/parametric/provider/StringProvider.java
@@ -48,7 +48,7 @@ public String get(CommandArgs arguments, List<? extends Annotation> modifiers) t
     }
 
     @Override
-    public List<String> getSuggestions(String prefix) {
+    public List<String> getSuggestions(CommandArgs arguments, List<? extends Annotation> modifiers, String prefix) {
         return Collections.emptyList();
     }
 
diff --git a/intake/src/test/java/com/sk89q/intake/parametric/provider/EnumProviderTest.java b/intake/src/test/java/com/sk89q/intake/parametric/provider/EnumProviderTest.java
index d22d363..385c113 100644
--- a/intake/src/test/java/com/sk89q/intake/parametric/provider/EnumProviderTest.java
+++ b/intake/src/test/java/com/sk89q/intake/parametric/provider/EnumProviderTest.java
@@ -49,13 +49,13 @@ public void testGetMissing() throws Exception {
 
     @Test
     public void testGetSuggestions() throws Exception {
-        assertThat(provider.getSuggestions(""), containsInAnyOrder("small", "medium", "large", "very_large"));
-        assertThat(provider.getSuggestions("s"), containsInAnyOrder("small"));
-        assertThat(provider.getSuggestions("la"), containsInAnyOrder("large"));
-        assertThat(provider.getSuggestions("very"), containsInAnyOrder("very_large"));
-        assertThat(provider.getSuggestions("verylarg"), containsInAnyOrder("very_large"));
-        assertThat(provider.getSuggestions("very_"), containsInAnyOrder("very_large"));
-        assertThat(provider.getSuggestions("tiny"), Matchers.<String>empty());
+        assertThat(provider.getSuggestions(Arguments.of(), ImmutableList.<Annotation>of(), ""), containsInAnyOrder("small", "medium", "large", "very_large"));
+        assertThat(provider.getSuggestions(Arguments.of(), ImmutableList.<Annotation>of(), "s"), containsInAnyOrder("small"));
+        assertThat(provider.getSuggestions(Arguments.of(), ImmutableList.<Annotation>of(), "la"), containsInAnyOrder("large"));
+        assertThat(provider.getSuggestions(Arguments.of(), ImmutableList.<Annotation>of(), "very"), containsInAnyOrder("very_large"));
+        assertThat(provider.getSuggestions(Arguments.of(), ImmutableList.<Annotation>of(), "verylarg"), containsInAnyOrder("very_large"));
+        assertThat(provider.getSuggestions(Arguments.of(), ImmutableList.<Annotation>of(), "very_"), containsInAnyOrder("very_large"));
+        assertThat(provider.getSuggestions(Arguments.of(), ImmutableList.<Annotation>of(), "tiny"), Matchers.<String>empty());
     }
 
     enum Size {