Added proper Spigot support