Renaming to datastructure