Update datastructures