Changes due to refactoring in s-ramp project.