diff --git a/.idea/copyright/MIT.xml b/.idea/copyright/MIT.xml
index 4c9a3d2f..ee7d1632 100644
--- a/.idea/copyright/MIT.xml
+++ b/.idea/copyright/MIT.xml
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
     <option name="myName" value="MIT" />
-    <option name="notice" value="Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License&#10; &#10; Permission is hereby granted, free of charge, to any person obtaining&#10; a copy of this software and associated documentation files (the&#10; &quot;Software&quot;), to deal in the Software without restriction, including&#10; without limitation the rights to use, copy, modify, merge, publish,&#10; distribute, sublicense, and/or sell copies of the Software, and to&#10; permit persons to whom the Software is furnished to do so, subject to&#10; the following conditions:&#10; &#10; The above copyright notice and this permission notice shall be&#10; included in all copies or substantial portions of the Software.&#10; &#10; THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,&#10; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF&#10; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND&#10; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE&#10; LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION&#10; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION&#10; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." />
+    <option name="notice" value="Copyright (c) 2016-&amp;#36;today.year Daniel Ennis (Aikar) - MIT License&#10; &#10; Permission is hereby granted, free of charge, to any person obtaining&#10; a copy of this software and associated documentation files (the&#10; &quot;Software&quot;), to deal in the Software without restriction, including&#10; without limitation the rights to use, copy, modify, merge, publish,&#10; distribute, sublicense, and/or sell copies of the Software, and to&#10; permit persons to whom the Software is furnished to do so, subject to&#10; the following conditions:&#10; &#10; The above copyright notice and this permission notice shall be&#10; included in all copies or substantial portions of the Software.&#10; &#10; THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,&#10; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF&#10; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND&#10; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE&#10; LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION&#10; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION&#10; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." />
   </copyright>
 </component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9cbd914d..13be41c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+  ~ 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
diff --git a/src/main/java/co/aikar/commands/BaseCommand.java b/src/main/java/co/aikar/commands/BaseCommand.java
index d3bdab83..df283447 100644
--- a/src/main/java/co/aikar/commands/BaseCommand.java
+++ b/src/main/java/co/aikar/commands/BaseCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/CommandCompletions.java b/src/main/java/co/aikar/commands/CommandCompletions.java
index aaecdf10..aa3c472d 100644
--- a/src/main/java/co/aikar/commands/CommandCompletions.java
+++ b/src/main/java/co/aikar/commands/CommandCompletions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/CommandLog.java b/src/main/java/co/aikar/commands/CommandLog.java
index cbece2da..103c8b55 100644
--- a/src/main/java/co/aikar/commands/CommandLog.java
+++ b/src/main/java/co/aikar/commands/CommandLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/CommandPatterns.java b/src/main/java/co/aikar/commands/CommandPatterns.java
index 57534311..7afaa91b 100644
--- a/src/main/java/co/aikar/commands/CommandPatterns.java
+++ b/src/main/java/co/aikar/commands/CommandPatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/CommandUtil.java b/src/main/java/co/aikar/commands/CommandUtil.java
index e7b01465..17b7ff16 100644
--- a/src/main/java/co/aikar/commands/CommandUtil.java
+++ b/src/main/java/co/aikar/commands/CommandUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/ForwardingCommand.java b/src/main/java/co/aikar/commands/ForwardingCommand.java
index 820710b1..5c37f26a 100644
--- a/src/main/java/co/aikar/commands/ForwardingCommand.java
+++ b/src/main/java/co/aikar/commands/ForwardingCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/InvalidCommandArgument.java b/src/main/java/co/aikar/commands/InvalidCommandArgument.java
index 6b60c67f..41711633 100644
--- a/src/main/java/co/aikar/commands/InvalidCommandArgument.java
+++ b/src/main/java/co/aikar/commands/InvalidCommandArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/RegisteredCommand.java b/src/main/java/co/aikar/commands/RegisteredCommand.java
index b30bff54..22b85d73 100644
--- a/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/SneakyThrow.java b/src/main/java/co/aikar/commands/SneakyThrow.java
index 57ead4cb..04807c38 100644
--- a/src/main/java/co/aikar/commands/SneakyThrow.java
+++ b/src/main/java/co/aikar/commands/SneakyThrow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/CommandAlias.java b/src/main/java/co/aikar/commands/annotation/CommandAlias.java
index 7b257fd7..7d52e57c 100644
--- a/src/main/java/co/aikar/commands/annotation/CommandAlias.java
+++ b/src/main/java/co/aikar/commands/annotation/CommandAlias.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/CommandCompletion.java b/src/main/java/co/aikar/commands/annotation/CommandCompletion.java
index 16cc13ff..862452b3 100644
--- a/src/main/java/co/aikar/commands/annotation/CommandCompletion.java
+++ b/src/main/java/co/aikar/commands/annotation/CommandCompletion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/CommandPermission.java b/src/main/java/co/aikar/commands/annotation/CommandPermission.java
index e27c16de..157fa949 100644
--- a/src/main/java/co/aikar/commands/annotation/CommandPermission.java
+++ b/src/main/java/co/aikar/commands/annotation/CommandPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Default.java b/src/main/java/co/aikar/commands/annotation/Default.java
index 8a64da57..1755197d 100644
--- a/src/main/java/co/aikar/commands/annotation/Default.java
+++ b/src/main/java/co/aikar/commands/annotation/Default.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Flags.java b/src/main/java/co/aikar/commands/annotation/Flags.java
index c41941c8..6af1f324 100644
--- a/src/main/java/co/aikar/commands/annotation/Flags.java
+++ b/src/main/java/co/aikar/commands/annotation/Flags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Optional.java b/src/main/java/co/aikar/commands/annotation/Optional.java
index 95d65fcf..55292489 100644
--- a/src/main/java/co/aikar/commands/annotation/Optional.java
+++ b/src/main/java/co/aikar/commands/annotation/Optional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Single.java b/src/main/java/co/aikar/commands/annotation/Single.java
index 730da5f3..fbe45529 100644
--- a/src/main/java/co/aikar/commands/annotation/Single.java
+++ b/src/main/java/co/aikar/commands/annotation/Single.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Split.java b/src/main/java/co/aikar/commands/annotation/Split.java
index 34dc630d..cb4d71b2 100644
--- a/src/main/java/co/aikar/commands/annotation/Split.java
+++ b/src/main/java/co/aikar/commands/annotation/Split.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Subcommand.java b/src/main/java/co/aikar/commands/annotation/Subcommand.java
index 9cf63014..bf6c431d 100644
--- a/src/main/java/co/aikar/commands/annotation/Subcommand.java
+++ b/src/main/java/co/aikar/commands/annotation/Subcommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Syntax.java b/src/main/java/co/aikar/commands/annotation/Syntax.java
index abae8ac3..7bccb046 100644
--- a/src/main/java/co/aikar/commands/annotation/Syntax.java
+++ b/src/main/java/co/aikar/commands/annotation/Syntax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/annotation/Values.java b/src/main/java/co/aikar/commands/annotation/Values.java
index df2d48da..f7231a87 100644
--- a/src/main/java/co/aikar/commands/annotation/Values.java
+++ b/src/main/java/co/aikar/commands/annotation/Values.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/contexts/CommandContexts.java b/src/main/java/co/aikar/commands/contexts/CommandContexts.java
index cf622f2a..afd363be 100644
--- a/src/main/java/co/aikar/commands/contexts/CommandContexts.java
+++ b/src/main/java/co/aikar/commands/contexts/CommandContexts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/contexts/CommandExecutionContext.java b/src/main/java/co/aikar/commands/contexts/CommandExecutionContext.java
index 636423f0..288a7bf4 100644
--- a/src/main/java/co/aikar/commands/contexts/CommandExecutionContext.java
+++ b/src/main/java/co/aikar/commands/contexts/CommandExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/contexts/ContextResolver.java b/src/main/java/co/aikar/commands/contexts/ContextResolver.java
index fcea846b..0870432d 100644
--- a/src/main/java/co/aikar/commands/contexts/ContextResolver.java
+++ b/src/main/java/co/aikar/commands/contexts/ContextResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java b/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
index 08609e87..be28b247 100644
--- a/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
+++ b/src/main/java/co/aikar/commands/contexts/OnlinePlayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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
diff --git a/src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java b/src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java
index 0f7fb50a..ca7f1b06 100644
--- a/src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java
+++ b/src/main/java/co/aikar/commands/contexts/SenderAwareContextResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Daniel Ennis (Aikar) - MIT License
+ * 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