Added relevant data structures