Lots of changes (see bukkit dev page for details)