added more to DataStructure