diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java
index dcedc6aa..4a6df1e3 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandContexts.java
@@ -23,8 +23,7 @@
 
 package co.aikar.commands;
 
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.contexts.bukkit.OnlinePlayer;
+import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -40,7 +39,6 @@ import org.jetbrains.annotations.Nullable;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -51,7 +49,11 @@ public class BukkitCommandContexts extends CommandContexts<BukkitCommandExecutio
     public BukkitCommandContexts(BukkitCommandManager manager) {
         super(manager);
 
-        registerContext(OnlinePlayer.class, c -> getOnlinePlayer(c.getIssuer(), c.popFirstArg(), c.hasAnnotation(Optional.class)));
+        registerContext(OnlinePlayer.class, c -> getOnlinePlayer(c.getIssuer(), c.popFirstArg(), c.isOptional()));
+        registerContext(co.aikar.commands.contexts.OnlinePlayer.class, c -> {
+            OnlinePlayer onlinePlayer = getOnlinePlayer(c.getIssuer(), c.popFirstArg(), c.isOptional());
+            return onlinePlayer != null ? new co.aikar.commands.contexts.OnlinePlayer(onlinePlayer.getPlayer()) : null;
+        });
         registerContext(OnlinePlayer[].class, (c) -> {
             BukkitCommandIssuer issuer = c.getIssuer();
             final String search = c.popFirstArg();
@@ -92,7 +94,7 @@ public class BukkitCommandContexts extends CommandContexts<BukkitCommandExecutio
         });
         registerIssuerAwareContext(CommandSender.class, BukkitCommandExecutionContext::getSender);
         registerIssuerAwareContext(Player.class, (c) -> {
-            boolean isOptional = c.hasAnnotation(Optional.class);
+            boolean isOptional = c.isOptional();
             CommandSender sender = c.getSender();
             boolean isPlayerSender = sender instanceof Player;
             if (!c.hasFlag("other")) {
diff --git a/bukkit/src/main/java/co/aikar/commands/contexts/bukkit/OnlinePlayer.java b/bukkit/src/main/java/co/aikar/commands/bukkit/contexts/OnlinePlayer.java
similarity index 93%
rename from bukkit/src/main/java/co/aikar/commands/contexts/bukkit/OnlinePlayer.java
rename to bukkit/src/main/java/co/aikar/commands/bukkit/contexts/OnlinePlayer.java
index c6900783..7d3fc1a3 100644
--- a/bukkit/src/main/java/co/aikar/commands/contexts/bukkit/OnlinePlayer.java
+++ b/bukkit/src/main/java/co/aikar/commands/bukkit/contexts/OnlinePlayer.java
@@ -21,7 +21,7 @@
  *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package co.aikar.commands.contexts.bukkit;
+package co.aikar.commands.bukkit.contexts;
 
 import org.bukkit.entity.Player;
 
@@ -53,8 +53,6 @@ public class OnlinePlayer {
 
     @Override
     public String toString() {
-        return "OnlinePlayer{" +
-                "player=" + player +
-                '}';
+        return "OnlinePlayer{player=" + player + '}';
     }
 }
diff --git a/bukkit/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java b/bukkit/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
index df69be83..1825722c 100644
--- a/bukkit/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
+++ b/bukkit/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
@@ -26,10 +26,10 @@ package co.aikar.commands.contexts;
 import org.bukkit.entity.Player;
 
 /**
- * @deprecated Use {@link co.aikar.commands.contexts.bukkit.OnlinePlayer instead}
+ * @deprecated Use {@link co.aikar.commands.bukkit.contexts.OnlinePlayer instead}
  */
 @Deprecated
-public class OnlinePlayer extends co.aikar.commands.contexts.bukkit.OnlinePlayer {
+public class OnlinePlayer extends co.aikar.commands.bukkit.contexts.OnlinePlayer {
     public OnlinePlayer(Player player) {
         super(player);
     }
diff --git a/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java b/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
index 1f189a85..93a55c94 100644
--- a/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
+++ b/bungee/src/main/java/co/aikar/commands/BungeeCommandContexts.java
@@ -25,10 +25,11 @@ package co.aikar.commands;
 
 
 import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.contexts.OnlineProxiedPlayer;
+import co.aikar.commands.bungee.contexts.OnlinePlayer;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -37,15 +38,10 @@ public class BungeeCommandContexts extends CommandContexts<BungeeCommandExecutio
 
     BungeeCommandContexts(CommandManager manager) {
         super(manager);
-        registerContext(OnlineProxiedPlayer.class, (c) -> {
-            ProxiedPlayer proxiedPlayer = ACFBungeeUtil.findPlayerSmart(c.getIssuer(), c.popFirstArg());
-            if (proxiedPlayer == null) {
-                if (c.hasAnnotation(Optional.class)) {
-                    return null;
-                }
-                throw new InvalidCommandArgument(false);
-            }
-            return new OnlineProxiedPlayer(proxiedPlayer);
+        registerContext(OnlinePlayer.class, this::getOnlinePlayer);
+        registerContext(co.aikar.commands.contexts.OnlineProxiedPlayer.class, c -> {
+            OnlinePlayer onlinePlayer = getOnlinePlayer(c);
+            return onlinePlayer != null ? new co.aikar.commands.contexts.OnlineProxiedPlayer(onlinePlayer.getPlayer()) : null;
         });
         registerIssuerAwareContext(CommandSender.class, BungeeCommandExecutionContext::getSender);
         registerIssuerAwareContext(ProxiedPlayer.class, (c) -> {
@@ -80,4 +76,16 @@ public class BungeeCommandContexts extends CommandContexts<BungeeCommandExecutio
             return match;
         });
     }
+
+    @Nullable
+    private co.aikar.commands.contexts.OnlineProxiedPlayer getOnlinePlayer(BungeeCommandExecutionContext c) throws InvalidCommandArgument {
+        ProxiedPlayer proxiedPlayer = ACFBungeeUtil.findPlayerSmart(c.getIssuer(), c.popFirstArg());
+        if (proxiedPlayer == null) {
+            if (c.hasAnnotation(Optional.class)) {
+                return null;
+            }
+            throw new InvalidCommandArgument(false);
+        }
+        return new co.aikar.commands.contexts.OnlineProxiedPlayer(proxiedPlayer);
+    }
 }
diff --git a/bungee/src/main/java/co/aikar/commands/bungee/contexts/OnlinePlayer.java b/bungee/src/main/java/co/aikar/commands/bungee/contexts/OnlinePlayer.java
new file mode 100644
index 00000000..120fbbe8
--- /dev/null
+++ b/bungee/src/main/java/co/aikar/commands/bungee/contexts/OnlinePlayer.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2016-2017 Daniel Ennis (Aikar) - MIT License
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining
+ *  a copy of this software and associated documentation files (the
+ *  "Software"), to deal in the Software without restriction, including
+ *  without limitation the rights to use, copy, modify, merge, publish,
+ *  distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to
+ *  the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be
+ *  included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package co.aikar.commands.bungee.contexts;
+
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.Objects;
+
+public class OnlinePlayer {
+
+    public final ProxiedPlayer player;
+
+    public OnlinePlayer(ProxiedPlayer player) {
+        this.player = player;
+    }
+
+    public ProxiedPlayer getPlayer() {
+        return player;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        OnlinePlayer that = (OnlinePlayer) o;
+        return Objects.equals(player, that.player);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(player);
+    }
+
+    @Override
+    public String toString() {
+        return "OnlinePlayer{player=" + player + '}';
+    }
+}
diff --git a/bungee/src/main/java/co/aikar/commands/contexts/OnlineProxiedPlayer.java b/bungee/src/main/java/co/aikar/commands/contexts/OnlineProxiedPlayer.java
index 258b8ea9..465549ca 100644
--- a/bungee/src/main/java/co/aikar/commands/contexts/OnlineProxiedPlayer.java
+++ b/bungee/src/main/java/co/aikar/commands/contexts/OnlineProxiedPlayer.java
@@ -1,61 +1,14 @@
-/*
- * Copyright (c) 2016-2017 Daniel Ennis (Aikar) - MIT License
- *
- *  Permission is hereby granted, free of charge, to any person obtaining
- *  a copy of this software and associated documentation files (the
- *  "Software"), to deal in the Software without restriction, including
- *  without limitation the rights to use, copy, modify, merge, publish,
- *  distribute, sublicense, and/or sell copies of the Software, and to
- *  permit persons to whom the Software is furnished to do so, subject to
- *  the following conditions:
- *
- *  The above copyright notice and this permission notice shall be
- *  included in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package co.aikar.commands.contexts;
 
+import co.aikar.commands.bungee.contexts.OnlinePlayer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
-import java.util.Objects;
-
-public class OnlineProxiedPlayer {
-
-    public final ProxiedPlayer player;
-
+/**
+ * @deprecated Use {@link OnlinePlayer}
+ */
+@Deprecated
+public class OnlineProxiedPlayer extends OnlinePlayer {
     public OnlineProxiedPlayer(ProxiedPlayer player) {
-        this.player = player;
-    }
-
-    public ProxiedPlayer getPlayer(){
-        return player;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        OnlineProxiedPlayer that = (OnlineProxiedPlayer) o;
-        return Objects.equals(player, that.player);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(player);
-    }
-
-    @Override
-    public String toString() {
-        return "OnlineProxiedPlayer{" +
-                "proxiedPlayer=" + player +
-                '}';
+        super(player);
     }
 }
diff --git a/example/src/main/java/co/aikar/acfexample/SomeCommand.java b/example/src/main/java/co/aikar/acfexample/SomeCommand.java
index b70429d2..27d7b400 100644
--- a/example/src/main/java/co/aikar/acfexample/SomeCommand.java
+++ b/example/src/main/java/co/aikar/acfexample/SomeCommand.java
@@ -33,7 +33,7 @@ import co.aikar.commands.annotation.Dependency;
 import co.aikar.commands.annotation.Optional;
 import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.annotation.Values;
-import co.aikar.commands.contexts.OnlinePlayer;
+import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/sponge/src/main/java/co/aikar/commands/SpongeCommandContexts.java b/sponge/src/main/java/co/aikar/commands/SpongeCommandContexts.java
index cf00b1ce..a02ae2b4 100644
--- a/sponge/src/main/java/co/aikar/commands/SpongeCommandContexts.java
+++ b/sponge/src/main/java/co/aikar/commands/SpongeCommandContexts.java
@@ -24,7 +24,7 @@
 package co.aikar.commands;
 
 import co.aikar.commands.contexts.CommandResultSupplier;
-import co.aikar.commands.contexts.sponge.OnlinePlayer;
+import co.aikar.commands.sponge.contexts.OnlinePlayer;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandSource;
@@ -50,6 +50,10 @@ public class SpongeCommandContexts extends CommandContexts<SpongeCommandExecutio
 
         registerIssuerOnlyContext(CommandResultSupplier.class, c -> new CommandResultSupplier());
         registerContext(OnlinePlayer.class, c -> getOnlinePlayer(c.getIssuer(), c.popFirstArg(), c.isOptional()));
+        registerContext(co.aikar.commands.contexts.OnlinePlayer.class, c -> {
+            OnlinePlayer onlinePlayer = getOnlinePlayer(c.getIssuer(), c.popFirstArg(), c.isOptional());
+            return onlinePlayer != null ? new co.aikar.commands.contexts.OnlinePlayer(onlinePlayer.getPlayer()) : null;
+        });
         registerContext(User.class, c -> {
             String name = c.popFirstArg();
             // try online players first
@@ -163,7 +167,6 @@ public class SpongeCommandContexts extends CommandContexts<SpongeCommandExecutio
     @Nullable
     OnlinePlayer getOnlinePlayer(SpongeCommandIssuer issuer, String lookup, boolean allowMissing) throws InvalidCommandArgument {
         Player player = ACFSpongeUtil.findPlayerSmart(issuer, lookup);
-        //noinspection Duplicates
         if (player == null) {
             if (allowMissing) {
                 return null;
diff --git a/sponge/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java b/sponge/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
index 7517018e..f3605398 100644
--- a/sponge/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
+++ b/sponge/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
@@ -26,10 +26,10 @@ package co.aikar.commands.contexts;
 import org.spongepowered.api.entity.living.player.Player;
 
 /**
- * @deprecated Use {@link co.aikar.commands.contexts.sponge.OnlinePlayer instead}
+ * @deprecated Use {@link co.aikar.commands.sponge.contexts.OnlinePlayer instead}
  */
 @Deprecated
-public class OnlinePlayer extends co.aikar.commands.contexts.sponge.OnlinePlayer {
+public class OnlinePlayer extends co.aikar.commands.sponge.contexts.OnlinePlayer {
     public OnlinePlayer(Player player) {
         super(player);
     }
diff --git a/sponge/src/main/java/co/aikar/commands/contexts/sponge/OnlinePlayer.java b/sponge/src/main/java/co/aikar/commands/sponge/contexts/OnlinePlayer.java
similarity index 93%
rename from sponge/src/main/java/co/aikar/commands/contexts/sponge/OnlinePlayer.java
rename to sponge/src/main/java/co/aikar/commands/sponge/contexts/OnlinePlayer.java
index 4c64dbe6..7cb5ee49 100644
--- a/sponge/src/main/java/co/aikar/commands/contexts/sponge/OnlinePlayer.java
+++ b/sponge/src/main/java/co/aikar/commands/sponge/contexts/OnlinePlayer.java
@@ -21,7 +21,7 @@
  *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package co.aikar.commands.contexts.sponge;
+package co.aikar.commands.sponge.contexts;
 
 import org.spongepowered.api.entity.living.player.Player;
 
@@ -53,8 +53,6 @@ public class OnlinePlayer {
 
     @Override
     public String toString() {
-        return "OnlinePlayer{" +
-                "player=" + player +
-                '}';
+        return "OnlinePlayer{player=" + player + '}';
     }
 }
diff --git a/velocity/src/main/java/co/aikar/commands/VelocityCommandContexts.java b/velocity/src/main/java/co/aikar/commands/VelocityCommandContexts.java
index e742c749..d62f197a 100644
--- a/velocity/src/main/java/co/aikar/commands/VelocityCommandContexts.java
+++ b/velocity/src/main/java/co/aikar/commands/VelocityCommandContexts.java
@@ -30,30 +30,25 @@ import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 
-import co.aikar.commands.annotation.Optional;
-import co.aikar.commands.contexts.velocity.OnlinePlayer;
+import co.aikar.commands.velocity.contexts.OnlinePlayer;
 import net.kyori.text.format.TextColor;
 import net.kyori.text.format.TextDecoration;
 import net.kyori.text.format.TextFormat;
+import org.jetbrains.annotations.Nullable;
 
 public class VelocityCommandContexts extends CommandContexts<VelocityCommandExecutionContext> {
 
     VelocityCommandContexts(ProxyServer server, CommandManager manager) {
         super(manager);
-        registerContext(OnlinePlayer.class, (c) -> {
-            Player proxiedPlayer = ACFVelocityUtil.findPlayerSmart(server, c.getIssuer(), c.popFirstArg());
-            if (proxiedPlayer == null) {
-                if (c.hasAnnotation(Optional.class)) {
-                    return null;
-                }
-                throw new InvalidCommandArgument(false);
-            }
-            return new OnlinePlayer(proxiedPlayer);
+        registerContext(OnlinePlayer.class, (c) -> getOnlinePlayer(server, c));
+        registerContext(co.aikar.commands.contexts.OnlinePlayer.class, c -> {
+            OnlinePlayer onlinePlayer = getOnlinePlayer(server, c);
+            return onlinePlayer != null ? new co.aikar.commands.contexts.OnlinePlayer(onlinePlayer.getPlayer()) : null;
         });
         registerIssuerAwareContext(CommandSource.class, VelocityCommandExecutionContext::getSender);
         registerIssuerAwareContext(Player.class, (c) -> {
             Player proxiedPlayer = c.getSender() instanceof Player ? (Player) c.getSender() : null;
-            if (proxiedPlayer == null && !c.hasAnnotation(Optional.class)) {
+            if (proxiedPlayer == null && !c.isOptional()) {
                 throw new InvalidCommandArgument(MessageKeys.NOT_ALLOWED_ON_CONSOLE, false);
             }
             return proxiedPlayer;
@@ -82,4 +77,16 @@ public class VelocityCommandContexts extends CommandContexts<VelocityCommandExec
             return match;
         });
     }
+
+    @Nullable
+    private OnlinePlayer getOnlinePlayer(ProxyServer server, VelocityCommandExecutionContext c) throws InvalidCommandArgument {
+        Player proxiedPlayer = ACFVelocityUtil.findPlayerSmart(server, c.getIssuer(), c.popFirstArg());
+        if (proxiedPlayer == null) {
+            if (c.isOptional()) {
+                return null;
+            }
+            throw new InvalidCommandArgument(false);
+        }
+        return new OnlinePlayer(proxiedPlayer);
+    }
 }
diff --git a/velocity/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java b/velocity/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
index 2c07ec11..63b31175 100644
--- a/velocity/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
+++ b/velocity/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
@@ -26,10 +26,10 @@ package co.aikar.commands.contexts;
 import com.velocitypowered.api.proxy.Player;
 
 /**
- * @deprecated Use {@link co.aikar.commands.contexts.velocity.OnlinePlayer instead}
+ * @deprecated Use {@link co.aikar.commands.velocity.contexts.OnlinePlayer instead}
  */
 @Deprecated
-public class OnlinePlayer extends co.aikar.commands.contexts.velocity.OnlinePlayer {
+public class OnlinePlayer extends co.aikar.commands.velocity.contexts.OnlinePlayer {
     public OnlinePlayer(Player player) {
         super(player);
     }
diff --git a/velocity/src/main/java/co/aikar/commands/contexts/velocity/OnlinePlayer.java b/velocity/src/main/java/co/aikar/commands/velocity/contexts/OnlinePlayer.java
similarity index 93%
rename from velocity/src/main/java/co/aikar/commands/contexts/velocity/OnlinePlayer.java
rename to velocity/src/main/java/co/aikar/commands/velocity/contexts/OnlinePlayer.java
index 6e89c6ac..b7494178 100644
--- a/velocity/src/main/java/co/aikar/commands/contexts/velocity/OnlinePlayer.java
+++ b/velocity/src/main/java/co/aikar/commands/velocity/contexts/OnlinePlayer.java
@@ -21,7 +21,7 @@
  *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package co.aikar.commands.contexts.velocity;
+package co.aikar.commands.velocity.contexts;
 
 import java.util.Objects;
 
@@ -54,8 +54,6 @@ public class OnlinePlayer {
 
     @Override
     public String toString() {
-        return "OnlinePlayer{" +
-                "player=" + player +
-                '}';
+        return "OnlinePlayer{player=" + player + '}';
     }
 }