Add 2nd order RSM support
Add 2nd order RSM support