Some updates to virtual topology