Update choice of data structures