Reorganized Item data flow