Improvements to Vcloud::Query