Refactor for new item format.