Upgrade to Spigot for future development.