Changed data structures

Signed-off-by: ExayDX <myriam.beauvais@usherbrooke.ca>