Added new data structure to facilitate plotting and data analysis