Followed API changes in RB.