[TASK]Updated data handling due to new structure
[TASK]Updated data preprocessing.
[TASK]Update event handling added some service functions.
[TASK]Updated templates for new data structure.
Merge remote-tracking branch 'origin/development'