Updated the data structure design portion