Extra data structures