New data structure added, more stable