Updated data structures description