Updating to work with Bukkit 1.5