Rvi_Vss refactoring