Rework scan items as component