Refactor according to changes in Item.