Defined new data structure as well as commented the segment to be refactored to support new data-structure