Restructured datastructure