Updated data structures