Added initial Spigot Support, use more proper variables