Updated data structures again