Temporary changes for dmsv component