[TASK]Updated data handling due to new structure