Update to handle new observables and iterables