itemsData refactor