Updated to reflect changes in Bukkit and CH