ComponentItem and Item consolidated