Enhanced fork of Spigot-API