Changes supporting new data delivery method.