Changes due to the refactoring of s-ramp.