TODO: Updated for new items.