Added datastructs