Fixed the data structure + added Canvas visuatlization