Updated data structure