Add spigot for 1.8 goodness