add more datastructure