Some renaming of classes, automated itemstack discovery