Porting DVSwitch component - more changes