Move to the new items schema