Refactoring, notably with items that have metadata based sub-items. New machines will be ItemStack based, not ID based.