Updated for Spigot 1.8