Update observables to use new data structure.