Imporve to DataStructure API