Updates to support non-managed VM report generation