Update to use item-list