Update for r2d2 changes