Conform to RBG API changes