Update helpers per rr changes