Update to support ESDR API change