Made change to data structures