Reworked WorkItem info filling process