Adapt to the new RLMS API