refactoring(xep-0136) changed RSM class