add riv for rst support