added vswitch and vport fields