Further changes to support new multi vmchooser model