Updated to support Spigot 1.8