Updates to data structures and references.