From 2005a872d1a36706178d7e8b06c318e5000564f6 Mon Sep 17 00:00:00 2001
From: JovalAutomation <automation@jovalcm.com>
Date: Fri, 16 Apr 2021 08:39:46 -0500
Subject: [PATCH] 77 WINDOWS CVEs: CVE-2021-28355, CVE-2021-2641...

---
 ...l_com.jovalcm.ms.cve_def_2021264130000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021264150000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021264160000.xml |  84 +++++
 ...l_com.jovalcm.ms.cve_def_2021264170000.xml |  77 +++++
 ...l_com.jovalcm.ms.cve_def_2021270720000.xml | 172 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021270790000.xml | 128 ++++++++
 ...l_com.jovalcm.ms.cve_def_2021270860000.xml |  89 ++++++
 ...l_com.jovalcm.ms.cve_def_2021270880000.xml |  89 ++++++
 ...l_com.jovalcm.ms.cve_def_2021270890000.xml | 233 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021270900000.xml |  45 +++
 ...l_com.jovalcm.ms.cve_def_2021270910000.xml |  53 ++++
 ...l_com.jovalcm.ms.cve_def_2021270920000.xml |  89 ++++++
 ...l_com.jovalcm.ms.cve_def_2021270930000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021270940000.xml | 226 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021270950000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021270960000.xml | 181 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283090000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283100000.xml |  89 ++++++
 ...l_com.jovalcm.ms.cve_def_2021283110000.xml | 116 +++++++
 ...l_com.jovalcm.ms.cve_def_2021283120000.xml |  77 +++++
 ...l_com.jovalcm.ms.cve_def_2021283140000.xml |  61 ++++
 ...l_com.jovalcm.ms.cve_def_2021283150000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283160000.xml | 202 ++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283170000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283180000.xml | 182 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283190000.xml |  89 ++++++
 ...l_com.jovalcm.ms.cve_def_2021283200000.xml | 128 ++++++++
 ...l_com.jovalcm.ms.cve_def_2021283230000.xml | 289 ++++++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283240000.xml |  45 +++
 ...l_com.jovalcm.ms.cve_def_2021283250000.xml | 172 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283260000.xml | 128 ++++++++
 ...l_com.jovalcm.ms.cve_def_2021283270000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283280000.xml | 289 ++++++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283290000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283300000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283310000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283320000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283330000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283340000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283350000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283360000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283370000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283380000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283390000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283400000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283410000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283420000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283430000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283440000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283450000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283460000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283470000.xml | 173 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283480000.xml | 182 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283490000.xml | 182 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283500000.xml | 182 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283510000.xml | 173 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283520000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283530000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283540000.xml | 228 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283550000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283560000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283570000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021283580000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284340000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284350000.xml | 156 ++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284360000.xml | 173 +++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284370000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284380000.xml |  89 ++++++
 ...l_com.jovalcm.ms.cve_def_2021284390000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284400000.xml | 232 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284410000.xml |  61 ++++
 ...l_com.jovalcm.ms.cve_def_2021284420000.xml |  89 ++++++
 ...l_com.jovalcm.ms.cve_def_2021284430000.xml | 208 +++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284440000.xml | 124 ++++++++
 ...l_com.jovalcm.ms.cve_def_2021284450000.xml | 233 ++++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284460000.xml | 208 +++++++++++++
 ...l_com.jovalcm.ms.cve_def_2021284470000.xml | 226 ++++++++++++++
 ...l_com.jovalcm.ms.cve_obj_2021264130003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021264130005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021264130006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021264130008.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021264160003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021264160005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021264170002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021264170003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021264170004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021264170005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270720003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270720005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270720007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270720009.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270720010.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270720011.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270790003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270790005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270860002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270860003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270860004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270860005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270880003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270880005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270890002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270890003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270890004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270890005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270890006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270890007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270910003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270930005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270940003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270940005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940006.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270940007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940008.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270940009.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940010.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940011.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940012.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270940013.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270950002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270950003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270950004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021270950005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270950006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270950007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270950008.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270950010.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270960007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021270960009.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283110002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021283110003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283110004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021283110005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283160003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283160005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283160006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283160007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283170003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283170005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283170006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283170007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283170008.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283170010.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283180003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283180004.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283180006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283180008.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283180009.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283190003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283190005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283200002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021283200003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283200004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021283200005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230009.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230010.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230011.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230012.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230014.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230017.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283230018.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283240004.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283240006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283250003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283250005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283260003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283260005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283270003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283270005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283270006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021283270007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284380003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284380005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284390003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284390005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284440003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284440005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450007.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450008.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450009.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450010.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450012.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284450014.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284460002.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021284460003.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284460004.xml |   4 +
 ...l_com.jovalcm.ms.cve_obj_2021284460005.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284460006.xml |   7 +
 ...l_com.jovalcm.ms.cve_obj_2021284460007.xml |   7 +
 ...l_com.jovalcm.ms.cve_ste_2021264130003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264130028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264160013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021264170011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720026.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270720029.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270790017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270860013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270880013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890025.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890027.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270890030.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270910003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270910004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270930028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940025.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940026.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940027.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940029.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940030.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940031.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940032.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940033.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940034.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940035.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940036.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940037.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940038.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940039.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940040.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940041.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940042.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940043.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940044.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940046.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940047.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940048.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270940049.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950025.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950027.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950030.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950031.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270950032.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283110015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283160025.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170025.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170027.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283170032.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283180022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283190013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283200017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230027.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230029.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230030.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230031.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230032.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230033.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230034.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230035.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230036.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230037.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230038.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230039.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230040.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230041.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230042.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230043.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230045.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230046.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230047.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230048.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230050.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230053.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283230056.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283240004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283240007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283250022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283260017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270025.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270026.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283270028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284380013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284390028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284440003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284440006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284440009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284440012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284440015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284440016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450020.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450023.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450025.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450026.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450027.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450028.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450030.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450031.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450032.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450033.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450037.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284450038.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460001.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460002.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460003.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460005.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460007.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460009.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460011.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460012.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460013.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460014.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460015.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460016.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460017.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460018.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460019.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460021.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460022.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021284460024.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021270960006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283470004.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283470006.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283470008.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283470010.xml |   3 +
 ...l_com.jovalcm.ms.cve_ste_2021283470013.xml |   3 +
 ...l_com.jovalcm.ms.cve_tst_2021264130001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130018.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264130020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264160009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264170001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264170002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264170003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264170004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264170006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021264170007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720016.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270720017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270790013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270860009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270880009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890016.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890019.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270890022.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270910001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270910002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270930020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940016.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940018.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940019.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940021.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940022.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940023.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940024.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940025.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940026.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940027.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940028.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940030.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940031.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940032.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270940033.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950018.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270950020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283110011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160016.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283160017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170018.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283170020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283180012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283190009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283200013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230016.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230018.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230019.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230021.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230022.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230023.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230024.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230025.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230026.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230027.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230029.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230030.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230031.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230032.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230034.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230035.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283230036.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283240002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283240003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283250014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283260013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270015.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270018.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283270020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284380009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284390020.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284440001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284440002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284440003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284440004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284440007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284440008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450012.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450016.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450017.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450018.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450019.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450021.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284450022.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460001.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460002.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460003.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460005.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460007.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460009.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460011.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460013.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460014.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021284460016.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021270960004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283470004.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283470006.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283470008.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283470010.xml |   4 +
 ...l_com.jovalcm.ms.cve_tst_2021283470013.xml |   4 +
 1030 files changed, 18038 insertions(+)
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264130000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264150000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264160000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264170000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270720000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270790000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270860000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270880000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270890000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270900000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270910000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270920000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270930000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270940000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270950000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270960000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283090000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283100000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283110000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283120000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283140000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283150000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283160000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283170000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283180000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283190000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283200000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283230000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283240000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283250000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283260000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283270000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283280000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283290000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283300000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283310000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283320000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283330000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283340000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283350000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283360000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283370000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283380000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283390000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283400000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283410000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283420000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283430000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283440000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283450000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283460000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283470000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283480000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283490000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283500000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283510000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283520000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283530000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283540000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283550000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283560000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283570000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283580000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284340000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284350000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284360000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284370000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284380000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284390000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284400000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284410000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284420000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284430000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284440000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284450000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284460000.xml
 create mode 100644 repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284470000.xml
 create mode 100644 repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130003.xml
 create mode 100644 repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130005.xml
 create mode 100644 repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130006.xml
 create mode 100644 repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130008.xml
 create mode 100644 repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160003.xml
 create mode 100644 repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160005.xml
 create mode 100644 repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170002.xml
 create mode 100644 repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170003.xml
 create mode 100644 repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170004.xml
 create mode 100644 repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170005.xml
 create mode 100644 repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720003.xml
 create mode 100644 repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720005.xml
 create mode 100644 repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720007.xml
 create mode 100644 repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720009.xml
 create mode 100644 repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720010.xml
 create mode 100644 repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720011.xml
 create mode 100644 repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790003.xml
 create mode 100644 repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790005.xml
 create mode 100644 repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860002.xml
 create mode 100644 repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860003.xml
 create mode 100644 repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860004.xml
 create mode 100644 repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860005.xml
 create mode 100644 repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880003.xml
 create mode 100644 repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880005.xml
 create mode 100644 repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890002.xml
 create mode 100644 repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890003.xml
 create mode 100644 repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890004.xml
 create mode 100644 repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890005.xml
 create mode 100644 repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890006.xml
 create mode 100644 repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890007.xml
 create mode 100644 repository/objects/windows/file_object/2021270910000/oval_com.jovalcm.ms.cve_obj_2021270910003.xml
 create mode 100644 repository/objects/windows/file_object/2021270930000/oval_com.jovalcm.ms.cve_obj_2021270930005.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940002.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940003.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940004.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940005.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940006.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940007.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940008.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940009.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940010.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940011.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940012.xml
 create mode 100644 repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940013.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950002.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950003.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950004.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950005.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950006.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950007.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950008.xml
 create mode 100644 repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950010.xml
 create mode 100644 repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960007.xml
 create mode 100644 repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960009.xml
 create mode 100644 repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110002.xml
 create mode 100644 repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110003.xml
 create mode 100644 repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110004.xml
 create mode 100644 repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110005.xml
 create mode 100644 repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160003.xml
 create mode 100644 repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160005.xml
 create mode 100644 repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160006.xml
 create mode 100644 repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160007.xml
 create mode 100644 repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170003.xml
 create mode 100644 repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170005.xml
 create mode 100644 repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170006.xml
 create mode 100644 repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170007.xml
 create mode 100644 repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170008.xml
 create mode 100644 repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170010.xml
 create mode 100644 repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180003.xml
 create mode 100644 repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180004.xml
 create mode 100644 repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180006.xml
 create mode 100644 repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180008.xml
 create mode 100644 repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180009.xml
 create mode 100644 repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190003.xml
 create mode 100644 repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190005.xml
 create mode 100644 repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200002.xml
 create mode 100644 repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200003.xml
 create mode 100644 repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200004.xml
 create mode 100644 repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200005.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230003.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230005.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230007.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230009.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230010.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230011.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230012.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230014.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230017.xml
 create mode 100644 repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230018.xml
 create mode 100644 repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240004.xml
 create mode 100644 repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240006.xml
 create mode 100644 repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250003.xml
 create mode 100644 repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250005.xml
 create mode 100644 repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260003.xml
 create mode 100644 repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260005.xml
 create mode 100644 repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270003.xml
 create mode 100644 repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270005.xml
 create mode 100644 repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270006.xml
 create mode 100644 repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270007.xml
 create mode 100644 repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380003.xml
 create mode 100644 repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380005.xml
 create mode 100644 repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390003.xml
 create mode 100644 repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390005.xml
 create mode 100644 repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440003.xml
 create mode 100644 repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440005.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450003.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450005.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450007.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450008.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450009.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450010.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450012.xml
 create mode 100644 repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450014.xml
 create mode 100644 repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460002.xml
 create mode 100644 repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460003.xml
 create mode 100644 repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460004.xml
 create mode 100644 repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460005.xml
 create mode 100644 repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460006.xml
 create mode 100644 repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460007.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130003.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130006.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130009.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130010.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130011.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130012.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130013.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130014.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130015.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130016.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130017.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130018.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130019.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130020.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130021.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130023.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130024.xml
 create mode 100644 repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130028.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160003.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160006.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160007.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160008.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160009.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160010.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160012.xml
 create mode 100644 repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160013.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170001.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170002.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170003.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170004.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170005.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170006.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170007.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170008.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170010.xml
 create mode 100644 repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170011.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720003.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720006.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720007.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720008.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720011.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720014.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720015.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720016.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720017.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720018.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720019.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720020.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720023.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720026.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720028.xml
 create mode 100644 repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720029.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790003.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790006.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790007.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790008.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790009.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790010.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790011.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790012.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790013.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790014.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790016.xml
 create mode 100644 repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790017.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860001.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860002.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860003.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860004.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860005.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860006.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860007.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860008.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860009.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860010.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860012.xml
 create mode 100644 repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860013.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880003.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880006.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880007.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880008.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880009.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880010.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880012.xml
 create mode 100644 repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880013.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890001.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890002.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890003.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890004.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890005.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890006.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890007.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890008.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890009.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890010.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890011.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890012.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890013.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890014.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890015.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890016.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890017.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890018.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890019.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890020.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890021.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890022.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890023.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890024.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890025.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890027.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890028.xml
 create mode 100644 repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890030.xml
 create mode 100644 repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910003.xml
 create mode 100644 repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910004.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930006.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930007.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930008.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930012.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930015.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930016.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930017.xml
 create mode 100644 repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930028.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940001.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940002.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940003.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940004.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940005.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940006.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940007.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940008.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940009.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940010.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940011.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940012.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940013.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940014.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940015.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940016.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940017.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940018.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940019.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940020.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940021.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940022.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940023.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940024.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940025.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940026.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940027.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940028.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940029.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940030.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940031.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940032.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940033.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940034.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940035.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940036.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940037.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940038.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940039.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940040.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940041.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940042.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940043.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940044.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940046.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940047.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940048.xml
 create mode 100644 repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940049.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950001.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950002.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950003.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950004.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950005.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950006.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950007.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950008.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950009.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950010.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950011.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950012.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950013.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950014.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950015.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950016.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950017.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950018.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950019.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950020.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950021.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950022.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950023.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950024.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950025.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950027.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950028.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950030.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950031.xml
 create mode 100644 repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950032.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960009.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960012.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960013.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960014.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960015.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960016.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960017.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960018.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960020.xml
 create mode 100644 repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960021.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110001.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110002.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110003.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110004.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110005.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110006.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110007.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110008.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110009.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110010.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110011.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110012.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110014.xml
 create mode 100644 repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110015.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160003.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160006.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160007.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160008.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160011.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160014.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160015.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160016.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160017.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160018.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160019.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160020.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160021.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160022.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160024.xml
 create mode 100644 repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160025.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170003.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170006.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170009.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170010.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170011.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170014.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170017.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170018.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170019.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170020.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170021.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170022.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170023.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170024.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170025.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170027.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170028.xml
 create mode 100644 repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170032.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180003.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180006.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180007.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180010.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180013.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180016.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180017.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180018.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180019.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180020.xml
 create mode 100644 repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180022.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190003.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190006.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190007.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190008.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190009.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190010.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190012.xml
 create mode 100644 repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190013.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200001.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200002.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200003.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200004.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200005.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200006.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200007.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200008.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200009.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200010.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200011.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200012.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200013.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200014.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200016.xml
 create mode 100644 repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200017.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230003.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230006.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230007.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230010.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230013.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230014.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230015.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230018.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230021.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230024.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230027.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230028.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230029.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230030.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230031.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230032.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230033.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230034.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230035.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230036.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230037.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230038.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230039.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230040.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230041.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230042.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230043.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230045.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230046.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230047.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230048.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230050.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230053.xml
 create mode 100644 repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230056.xml
 create mode 100644 repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240004.xml
 create mode 100644 repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240007.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250003.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250006.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250007.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250008.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250011.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250014.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250015.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250016.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250017.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250018.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250019.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250020.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250021.xml
 create mode 100644 repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250022.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260003.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260006.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260007.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260008.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260009.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260010.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260011.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260012.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260013.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260014.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260016.xml
 create mode 100644 repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260017.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270003.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270006.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270007.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270008.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270009.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270012.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270015.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270016.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270017.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270018.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270019.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270020.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270021.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270022.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270023.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270025.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270026.xml
 create mode 100644 repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270028.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380003.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380006.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380007.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380008.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380009.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380010.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380012.xml
 create mode 100644 repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380013.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390003.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390006.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390007.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390008.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390009.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390012.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390015.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390016.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390017.xml
 create mode 100644 repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390028.xml
 create mode 100644 repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440003.xml
 create mode 100644 repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440006.xml
 create mode 100644 repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440009.xml
 create mode 100644 repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440012.xml
 create mode 100644 repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440015.xml
 create mode 100644 repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440016.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450003.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450006.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450009.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450010.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450011.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450012.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450015.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450018.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450019.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450020.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450021.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450022.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450023.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450024.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450025.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450026.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450027.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450028.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450030.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450031.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450032.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450033.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450037.xml
 create mode 100644 repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450038.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460001.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460002.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460003.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460004.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460005.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460006.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460007.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460008.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460009.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460010.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460011.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460012.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460013.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460014.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460015.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460016.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460017.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460018.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460019.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460021.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460022.xml
 create mode 100644 repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460024.xml
 create mode 100644 repository/states/windows/registry_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960006.xml
 create mode 100644 repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470004.xml
 create mode 100644 repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470006.xml
 create mode 100644 repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470008.xml
 create mode 100644 repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470010.xml
 create mode 100644 repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470013.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130001.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130002.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130003.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130004.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130005.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130006.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130007.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130008.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130009.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130010.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130011.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130012.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130013.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130014.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130015.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130017.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130018.xml
 create mode 100644 repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130020.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160001.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160002.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160003.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160004.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160005.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160006.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160008.xml
 create mode 100644 repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160009.xml
 create mode 100644 repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170001.xml
 create mode 100644 repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170002.xml
 create mode 100644 repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170003.xml
 create mode 100644 repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170004.xml
 create mode 100644 repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170006.xml
 create mode 100644 repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170007.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720001.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720002.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720003.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720004.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720005.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720006.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720007.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720008.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720009.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720010.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720011.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720012.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720013.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720014.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720016.xml
 create mode 100644 repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720017.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790001.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790002.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790003.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790004.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790005.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790006.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790007.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790008.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790009.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790010.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790012.xml
 create mode 100644 repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790013.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860001.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860002.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860003.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860004.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860005.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860006.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860008.xml
 create mode 100644 repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860009.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880001.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880002.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880003.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880004.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880005.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880006.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880008.xml
 create mode 100644 repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880009.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890001.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890002.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890003.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890004.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890005.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890006.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890007.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890008.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890009.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890010.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890011.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890012.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890013.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890014.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890015.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890016.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890017.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890019.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890020.xml
 create mode 100644 repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890022.xml
 create mode 100644 repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910001.xml
 create mode 100644 repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910002.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930002.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930003.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930004.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930006.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930007.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930008.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930009.xml
 create mode 100644 repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930020.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940001.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940002.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940003.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940004.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940005.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940006.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940007.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940008.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940009.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940010.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940011.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940012.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940013.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940014.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940015.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940016.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940017.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940018.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940019.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940020.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940021.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940022.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940023.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940024.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940025.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940026.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940027.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940028.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940030.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940031.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940032.xml
 create mode 100644 repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940033.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950001.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950002.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950003.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950004.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950005.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950006.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950007.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950008.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950009.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950010.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950011.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950012.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950013.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950014.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950015.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950017.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950018.xml
 create mode 100644 repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950020.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960005.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960006.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960007.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960008.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960009.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960010.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960011.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960012.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960014.xml
 create mode 100644 repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960015.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110001.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110002.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110003.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110004.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110005.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110006.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110007.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110008.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110010.xml
 create mode 100644 repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110011.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160001.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160002.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160003.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160004.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160005.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160006.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160007.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160008.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160009.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160010.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160011.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160012.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160013.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160014.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160016.xml
 create mode 100644 repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160017.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170001.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170002.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170003.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170004.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170005.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170006.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170007.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170008.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170009.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170010.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170011.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170012.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170013.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170014.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170015.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170017.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170018.xml
 create mode 100644 repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170020.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180001.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180002.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180003.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180004.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180005.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180006.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180007.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180008.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180009.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180010.xml
 create mode 100644 repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180012.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190001.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190002.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190003.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190004.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190005.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190006.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190008.xml
 create mode 100644 repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190009.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200001.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200002.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200003.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200004.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200005.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200006.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200007.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200008.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200009.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200010.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200012.xml
 create mode 100644 repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200013.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230001.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230002.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230003.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230004.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230005.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230006.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230007.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230008.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230009.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230010.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230011.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230012.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230013.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230014.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230015.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230016.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230017.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230018.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230019.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230020.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230021.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230022.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230023.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230024.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230025.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230026.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230027.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230029.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230030.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230031.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230032.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230034.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230035.xml
 create mode 100644 repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230036.xml
 create mode 100644 repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240002.xml
 create mode 100644 repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240003.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250001.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250002.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250003.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250004.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250005.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250006.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250007.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250008.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250009.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250010.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250011.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250012.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250013.xml
 create mode 100644 repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250014.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260001.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260002.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260003.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260004.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260005.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260006.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260007.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260008.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260009.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260010.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260012.xml
 create mode 100644 repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260013.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270001.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270002.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270003.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270004.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270005.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270006.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270007.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270008.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270009.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270010.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270011.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270012.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270013.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270014.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270015.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270017.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270018.xml
 create mode 100644 repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270020.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380001.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380002.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380003.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380004.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380005.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380006.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380008.xml
 create mode 100644 repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380009.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390001.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390002.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390003.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390004.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390005.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390006.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390007.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390008.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390009.xml
 create mode 100644 repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390020.xml
 create mode 100644 repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440001.xml
 create mode 100644 repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440002.xml
 create mode 100644 repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440003.xml
 create mode 100644 repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440004.xml
 create mode 100644 repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440007.xml
 create mode 100644 repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440008.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450001.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450002.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450003.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450004.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450005.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450006.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450007.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450008.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450009.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450010.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450011.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450012.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450013.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450014.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450016.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450017.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450018.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450019.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450021.xml
 create mode 100644 repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450022.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460001.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460002.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460003.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460004.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460005.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460006.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460007.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460008.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460009.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460010.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460011.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460013.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460014.xml
 create mode 100644 repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460016.xml
 create mode 100644 repository/tests/windows/registry_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960004.xml
 create mode 100644 repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470004.xml
 create mode 100644 repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470006.xml
 create mode 100644 repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470008.xml
 create mode 100644 repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470010.xml
 create mode 100644 repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470013.xml

diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264130000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264130000.xml
new file mode 100644
index 00000000000..9120702ffc3
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264130000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021264130000" version="0">
+  <metadata>
+    <title>Windows Installer Spoofing Vulnerability - CVE-2021-26413</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-26413" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-26413"/>
+    <reference ref_id="MSRC-CVE-2021-26413" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-26413"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130007" comment="msi.dll (32-bit) (5.x) version is less than 5.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130011" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130015" comment="msi.dll (32-bit) (5.x) version is less than 5.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264150000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264150000.xml
new file mode 100644
index 00000000000..dc05f0a655d
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264150000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021264150000" version="0">
+  <metadata>
+    <title>Windows Installer Elevation of Privilege Vulnerability - CVE-2021-26415</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-26415" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-26415"/>
+    <reference ref_id="MSRC-CVE-2021-26415" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-26415"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130007" comment="msi.dll (32-bit) (5.x) version is less than 5.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130011" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130015" comment="msi.dll (32-bit) (5.x) version is less than 5.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264160000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264160000.xml
new file mode 100644
index 00000000000..2212b914eec
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264160000.xml
@@ -0,0 +1,84 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021264160000" version="0">
+  <metadata>
+    <title>Windows Hyper-V Denial of Service Vulnerability - CVE-2021-26416</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-26416" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-26416"/>
+    <reference ref_id="MSRC-CVE-2021-26416" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-26416"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160001" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160002" comment="hvax64.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160001" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160002" comment="hvax64.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160001" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160002" comment="hvax64.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160005" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160006" comment="hvax64.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264170000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264170000.xml
new file mode 100644
index 00000000000..be1f9d145cb
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021264170000.xml
@@ -0,0 +1,77 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021264170000" version="0">
+  <metadata>
+    <title>Windows Overlay Filter Information Disclosure Vulnerability - CVE-2021-26417</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-26417" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-26417"/>
+    <reference ref_id="MSRC-CVE-2021-26417" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-26417"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170001" comment="wof.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170002" comment="wof.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170001" comment="wof.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170002" comment="wof.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170001" comment="wof.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170003" comment="wof.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170004" comment="wof.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170003" comment="wof.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170006" comment="wof.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170007" comment="wof.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170006" comment="wof.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170007" comment="wof.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170006" comment="wof.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264170006" comment="wof.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270720000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270720000.xml
new file mode 100644
index 00000000000..62d65011112
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270720000.xml
@@ -0,0 +1,172 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270720000" version="0">
+  <metadata>
+    <title>Win32k Elevation of Privilege Vulnerability - CVE-2021-27072</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27072" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27072"/>
+    <reference ref_id="MSRC-CVE-2021-27072" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27072"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720001" comment="win32k.sys (32-bit) (6.x) version is less than 6.2.9200.23337"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720002" comment="win32k.sys (6.x) version is less than 6.2.9200.23337"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720001" comment="win32k.sys (32-bit) (6.x) version is less than 6.2.9200.23337"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720002" comment="win32k.sys (6.x) version is less than 6.2.9200.23337"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720003" comment="win32k.sys (6.x) version is less than 6.3.9600.19990"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720004" comment="win32k.sys (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720003" comment="win32k.sys (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720004" comment="win32k.sys (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720003" comment="win32k.sys (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720004" comment="win32k.sys (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720003" comment="win32k.sys (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720005" comment="win32kfull.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720006" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720005" comment="win32kfull.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720007" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.14393.4283"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720008" comment="win32kfull.sys (10.x) version is less than 10.0.14393.4283"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720008" comment="win32kfull.sys (10.x) version is less than 10.0.14393.4283"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720007" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.14393.4283"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720008" comment="win32kfull.sys (10.x) version is less than 10.0.14393.4283"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720007" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.14393.4283"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720008" comment="win32kfull.sys (10.x) version is less than 10.0.14393.4283"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720009" comment="win32kfull.sys (10.x) version is less than 10.0.17134.2087"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720010" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17134.2087"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720009" comment="win32kfull.sys (10.x) version is less than 10.0.17134.2087"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720011" comment="win32kfull.sys (10.x) version is less than 10.0.17763.1852"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720012" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17763.1852"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720011" comment="win32kfull.sys (10.x) version is less than 10.0.17763.1852"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720012" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17763.1852"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720011" comment="win32kfull.sys (10.x) version is less than 10.0.17763.1852"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720013" comment="win32k.sys (10.x) version is less than 10.0.18362.1474"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720014" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.18362.1474"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720013" comment="win32k.sys (10.x) version is less than 10.0.18362.1474"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720017" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.19041.906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720017" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.19041.906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270790000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270790000.xml
new file mode 100644
index 00000000000..c7a5b257847
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270790000.xml
@@ -0,0 +1,128 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270790000" version="0">
+  <metadata>
+    <title>Windows Media Photo Codec Information Disclosure Vulnerability - CVE-2021-27079</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27079" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27079"/>
+    <reference ref_id="MSRC-CVE-2021-27079" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27079"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790001" comment="wmphoto.dll (10.x) version is less than 10.0.10240.18874"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790002" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.10240.18874"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790001" comment="wmphoto.dll (10.x) version is less than 10.0.10240.18874"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790003" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.14393.4283"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790004" comment="wmphoto.dll (10.x) version is less than 10.0.14393.4283"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790004" comment="wmphoto.dll (10.x) version is less than 10.0.14393.4283"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790003" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.14393.4283"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790004" comment="wmphoto.dll (10.x) version is less than 10.0.14393.4283"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790003" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.14393.4283"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790004" comment="wmphoto.dll (10.x) version is less than 10.0.14393.4283"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790005" comment="wmphoto.dll (10.x) version is less than 10.0.17134.2087"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790006" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.17134.2087"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790005" comment="wmphoto.dll (10.x) version is less than 10.0.17134.2087"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790007" comment="wmphoto.dll (10.x) version is less than 10.0.17763.1817"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790008" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.17763.1817"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790007" comment="wmphoto.dll (10.x) version is less than 10.0.17763.1817"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790008" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.17763.1817"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790007" comment="wmphoto.dll (10.x) version is less than 10.0.17763.1817"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790009" comment="wmphoto.dll (10.x) version is less than 10.0.18362.1440"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790010" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.18362.1440"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790009" comment="wmphoto.dll (10.x) version is less than 10.0.18362.1440"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790012" comment="wmphoto.dll (10.x) version is less than 10.0.19041.867"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790013" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.19041.867"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790012" comment="wmphoto.dll (10.x) version is less than 10.0.19041.867"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790013" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.19041.867"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790012" comment="wmphoto.dll (10.x) version is less than 10.0.19041.867"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270790012" comment="wmphoto.dll (10.x) version is less than 10.0.19041.867"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270860000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270860000.xml
new file mode 100644
index 00000000000..87fa979ee23
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270860000.xml
@@ -0,0 +1,89 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270860000" version="0">
+  <metadata>
+    <title>Windows Services and Controller App Elevation of Privilege Vulnerability - CVE-2021-27086</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27086" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27086"/>
+    <reference ref_id="MSRC-CVE-2021-27086" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27086"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860001" comment="services.exe (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860002" comment="services.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860001" comment="services.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860003" comment="services.exe (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860004" comment="services.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860003" comment="services.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860004" comment="services.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860003" comment="services.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860005" comment="services.exe (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860006" comment="services.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860005" comment="services.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860008" comment="services.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860009" comment="services.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860008" comment="services.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860009" comment="services.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860008" comment="services.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270860008" comment="services.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270880000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270880000.xml
new file mode 100644
index 00000000000..2098f3d66f2
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270880000.xml
@@ -0,0 +1,89 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270880000" version="0">
+  <metadata>
+    <title>Windows Event Tracing Elevation of Privilege Vulnerability - CVE-2021-27088</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27088" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27088"/>
+    <reference ref_id="MSRC-CVE-2021-27088" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27088"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880002" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880006" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270890000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270890000.xml
new file mode 100644
index 00000000000..d23691a0bab
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270890000.xml
@@ -0,0 +1,233 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270890000" version="0">
+  <metadata>
+    <title>Microsoft Internet Messaging API Remote Code Execution Vulnerability - CVE-2021-27089</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27089" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27089"/>
+    <reference ref_id="MSRC-CVE-2021-27089" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27089"/>
+    <reference ref_id="KB5001392" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001392"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890001" comment="inetcomm.dll (6.x) version is less than 6.1.7601.24576"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890002" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.1.7601.24576"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890001" comment="inetcomm.dll (6.x) version is less than 6.1.7601.24576"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890002" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.1.7601.24576"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890001" comment="inetcomm.dll (6.x) version is less than 6.1.7601.24576"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890002" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.1.7601.24576"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890001" comment="inetcomm.dll (6.x) version is less than 6.1.7601.24576"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890003" comment="inetcomm.dll (6.x) version is less than 6.0.6003.21096"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890004" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.2.9200.23328"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890005" comment="inetcomm.dll (6.x) version is less than 6.2.9200.23328"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890004" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.2.9200.23328"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890005" comment="inetcomm.dll (6.x) version is less than 6.2.9200.23328"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890006" comment="inetcomm.dll (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890007" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890006" comment="inetcomm.dll (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890007" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890006" comment="inetcomm.dll (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890007" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890006" comment="inetcomm.dll (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890008" comment="inetcomm.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890009" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890008" comment="inetcomm.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890010" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890011" comment="inetcomm.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890011" comment="inetcomm.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890010" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890011" comment="inetcomm.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890010" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890011" comment="inetcomm.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890012" comment="inetcomm.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890013" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890012" comment="inetcomm.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890014" comment="inetcomm.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890015" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890014" comment="inetcomm.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890015" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890014" comment="inetcomm.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890016" comment="inetcomm.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890017" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890016" comment="inetcomm.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890019" comment="inetcomm.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890020" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890019" comment="inetcomm.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890020" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890019" comment="inetcomm.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890019" comment="inetcomm.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890003" comment="inetcomm.dll (6.x) version is less than 6.0.6003.21096"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890022" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.0.6003.21096"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890003" comment="inetcomm.dll (6.x) version is less than 6.0.6003.21096"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890022" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.0.6003.21096"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270890003" comment="inetcomm.dll (6.x) version is less than 6.0.6003.21096"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270900000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270900000.xml
new file mode 100644
index 00000000000..bec9f604df8
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270900000.xml
@@ -0,0 +1,45 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270900000" version="0">
+  <metadata>
+    <title>Windows Secure Kernel Mode Elevation of Privilege Vulnerability - CVE-2021-27090</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27090" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27090"/>
+    <reference ref_id="MSRC-CVE-2021-27090" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27090"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270910000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270910000.xml
new file mode 100644
index 00000000000..7c4e86818d0
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270910000.xml
@@ -0,0 +1,53 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270910000" version="0">
+  <metadata>
+    <title>RPC Endpoint Mapper Service Elevation of Privilege Vulnerability - CVE-2021-27091</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27091" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27091"/>
+    <reference ref_id="MSRC-CVE-2021-27091" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27091"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="KB5001383 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="KB5001383 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270920000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270920000.xml
new file mode 100644
index 00000000000..91f823d876b
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270920000.xml
@@ -0,0 +1,89 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270920000" version="0">
+  <metadata>
+    <title>Azure AD Web Sign-in Security Feature Bypass Vulnerability - CVE-2021-27092</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27092" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27092"/>
+    <reference ref_id="MSRC-CVE-2021-27092" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27092"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880002" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880006" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270930000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270930000.xml
new file mode 100644
index 00000000000..9f4294217bc
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270930000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270930000" version="0">
+  <metadata>
+    <title>Windows Kernel Information Disclosure Vulnerability - CVE-2021-27093</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27093" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27093"/>
+    <reference ref_id="MSRC-CVE-2021-27093" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27093"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930004" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.2.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="ntoskrnl.exe (6.x) version is less than 6.2.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930004" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.2.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="ntoskrnl.exe (6.x) version is less than 6.2.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930006" comment="ntoskrnl.exe (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930007" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930006" comment="ntoskrnl.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880002" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880006" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930020" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930020" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270940000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270940000.xml
new file mode 100644
index 00000000000..410d37da1a9
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270940000.xml
@@ -0,0 +1,226 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270940000" version="0">
+  <metadata>
+    <title>Windows Early Launch Antimalware Driver Security Feature Bypass Vulnerability - CVE-2021-27094</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27094" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27094"/>
+    <reference ref_id="MSRC-CVE-2021-27094" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27094"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940001" comment="winload.efi (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940002" comment="winload.exe (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940003" comment="winload.efi (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940004" comment="winload.exe (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940001" comment="winload.efi (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940002" comment="winload.exe (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940003" comment="winload.efi (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940004" comment="winload.exe (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940007" comment="winload.efi (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940008" comment="winload.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940007" comment="winload.efi (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940008" comment="winload.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940007" comment="winload.efi (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940008" comment="winload.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940009" comment="winload.efi (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940010" comment="winload.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940011" comment="winload.efi (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940012" comment="winload.exe (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940009" comment="winload.efi (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940010" comment="winload.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940013" comment="winload.efi (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940014" comment="winload.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940013" comment="winload.efi (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940014" comment="winload.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940013" comment="winload.efi (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940014" comment="winload.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940017" comment="winload.efi (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940018" comment="winload.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940019" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940020" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940017" comment="winload.efi (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940018" comment="winload.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940021" comment="winload.efi (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940022" comment="winload.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940023" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940024" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940021" comment="winload.efi (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940022" comment="winload.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940023" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940024" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940021" comment="winload.efi (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940022" comment="winload.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940025" comment="winload.efi (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940026" comment="winload.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940027" comment="winload.efi (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940028" comment="winload.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940025" comment="winload.efi (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940026" comment="winload.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940032" comment="winload.efi (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940033" comment="winload.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940032" comment="winload.efi (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940033" comment="winload.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270950000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270950000.xml
new file mode 100644
index 00000000000..aeb445399d6
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270950000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270950000" version="0">
+  <metadata>
+    <title>Windows Media Video Decoder Remote Code Execution Vulnerability - CVE-2021-27095</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27095" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27095"/>
+    <reference ref_id="MSRC-CVE-2021-27095" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27095"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950004" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950005" comment="wmvdecod.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950004" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950005" comment="wmvdecod.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950006" comment="wmvdecod.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950007" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950006" comment="wmvdecod.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950008" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950008" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950008" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950010" comment="wmvdecod.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950011" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950010" comment="wmvdecod.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950012" comment="wmvdecod.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950013" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950012" comment="wmvdecod.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950013" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950012" comment="wmvdecod.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950014" comment="wmvdecod.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950015" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950014" comment="wmvdecod.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950018" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950018" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950020" comment="wmvdecod.dll (32-bit) (11.x) version is less than 11.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950020" comment="wmvdecod.dll (32-bit) (11.x) version is less than 11.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270960000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270960000.xml
new file mode 100644
index 00000000000..aa4632c8ca4
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021270960000.xml
@@ -0,0 +1,181 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021270960000" version="0">
+  <metadata>
+    <title>NTFS Elevation of Privilege Vulnerability - CVE-2021-27096</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-27096" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27096"/>
+    <reference ref_id="MSRC-CVE-2021-27096" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-27096"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="KB5001383 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="KB5001383 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960005" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960006" comment="ntfs.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960006" comment="ntfs.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960005" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960006" comment="ntfs.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960005" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960006" comment="ntfs.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960007" comment="ntfs.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960008" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960007" comment="ntfs.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960009" comment="ntfs.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960010" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960009" comment="ntfs.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960010" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960009" comment="ntfs.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960011" comment="ntfs.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960012" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960011" comment="ntfs.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960015" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960015" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283090000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283090000.xml
new file mode 100644
index 00000000000..93ef6fb7930
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283090000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283090000" version="0">
+  <metadata>
+    <title>Windows Kernel Information Disclosure Vulnerability - CVE-2021-28309</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28309" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28309"/>
+    <reference ref_id="MSRC-CVE-2021-28309" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28309"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930004" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.2.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="ntoskrnl.exe (6.x) version is less than 6.2.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930004" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.2.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="ntoskrnl.exe (6.x) version is less than 6.2.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930006" comment="ntoskrnl.exe (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930007" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930006" comment="ntoskrnl.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880002" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880006" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930020" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930020" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283100000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283100000.xml
new file mode 100644
index 00000000000..2b99b8021d7
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283100000.xml
@@ -0,0 +1,89 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283100000" version="0">
+  <metadata>
+    <title>Win32k Elevation of Privilege Vulnerability - CVE-2021-28310</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28310" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28310"/>
+    <reference ref_id="MSRC-CVE-2021-28310" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28310"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720009" comment="win32kfull.sys (10.x) version is less than 10.0.17134.2087"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720010" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17134.2087"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720009" comment="win32kfull.sys (10.x) version is less than 10.0.17134.2087"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720011" comment="win32kfull.sys (10.x) version is less than 10.0.17763.1852"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720012" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17763.1852"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720011" comment="win32kfull.sys (10.x) version is less than 10.0.17763.1852"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720012" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17763.1852"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720011" comment="win32kfull.sys (10.x) version is less than 10.0.17763.1852"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720013" comment="win32k.sys (10.x) version is less than 10.0.18362.1474"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720014" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.18362.1474"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720013" comment="win32k.sys (10.x) version is less than 10.0.18362.1474"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720017" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.19041.906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720017" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.19041.906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270720016" comment="win32k.sys (10.x) version is less than 10.0.19041.906"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283110000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283110000.xml
new file mode 100644
index 00000000000..012fa1f9d6a
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283110000.xml
@@ -0,0 +1,116 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283110000" version="0">
+  <metadata>
+    <title>Windows Application Compatibility Cache Denial of Service Vulnerability - CVE-2021-28311</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28311" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28311"/>
+    <reference ref_id="MSRC-CVE-2021-28311" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28311"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110001" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110002" comment="ahcache.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110002" comment="ahcache.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110001" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110002" comment="ahcache.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110001" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110002" comment="ahcache.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110003" comment="ahcache.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110004" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110003" comment="ahcache.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110005" comment="ahcache.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110006" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110005" comment="ahcache.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110006" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110005" comment="ahcache.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110007" comment="ahcache.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110008" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110007" comment="ahcache.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110010" comment="ahcache.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110011" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110010" comment="ahcache.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110011" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110010" comment="ahcache.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283110010" comment="ahcache.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283120000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283120000.xml
new file mode 100644
index 00000000000..e1137a6e29f
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283120000.xml
@@ -0,0 +1,77 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283120000" version="0">
+  <metadata>
+    <title>Windows NTFS Denial of Service Vulnerability - CVE-2021-28312</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28312" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28312"/>
+    <reference ref_id="MSRC-CVE-2021-28312" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28312"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960009" comment="ntfs.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960010" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960009" comment="ntfs.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960010" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960009" comment="ntfs.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960011" comment="ntfs.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960012" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960011" comment="ntfs.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960015" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960015" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960014" comment="ntfs.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283140000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283140000.xml
new file mode 100644
index 00000000000..6b554f7d1a9
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283140000.xml
@@ -0,0 +1,61 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283140000" version="0">
+  <metadata>
+    <title>Windows Hyper-V Elevation of Privilege Vulnerability - CVE-2021-28314</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28314" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28314"/>
+    <reference ref_id="MSRC-CVE-2021-28314" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28314"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160005" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160006" comment="hvax64.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283150000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283150000.xml
new file mode 100644
index 00000000000..a98eca41ba5
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283150000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283150000" version="0">
+  <metadata>
+    <title>Windows Media Video Decoder Remote Code Execution Vulnerability - CVE-2021-28315</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28315" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28315"/>
+    <reference ref_id="MSRC-CVE-2021-28315" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28315"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950004" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950005" comment="wmvdecod.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950004" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950005" comment="wmvdecod.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950002" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950001" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950006" comment="wmvdecod.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950007" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950006" comment="wmvdecod.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950008" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950008" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950008" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950009" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950010" comment="wmvdecod.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950011" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950010" comment="wmvdecod.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950012" comment="wmvdecod.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950013" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950012" comment="wmvdecod.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950013" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950012" comment="wmvdecod.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950014" comment="wmvdecod.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950015" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950014" comment="wmvdecod.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950018" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950018" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950017" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950020" comment="wmvdecod.dll (32-bit) (11.x) version is less than 11.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950020" comment="wmvdecod.dll (32-bit) (11.x) version is less than 11.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270950003" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283160000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283160000.xml
new file mode 100644
index 00000000000..489c848f1db
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283160000.xml
@@ -0,0 +1,202 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283160000" version="0">
+  <metadata>
+    <title>Windows WLAN AutoConfig Service Security Feature Bypass Vulnerability - CVE-2021-28316</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28316" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28316"/>
+    <reference ref_id="MSRC-CVE-2021-28316" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28316"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160002" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160002" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160002" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160003" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.2.9200.23332"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160004" comment="wlansvc.dll (6.x) version is less than 6.2.9200.23332"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160003" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.2.9200.23332"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160004" comment="wlansvc.dll (6.x) version is less than 6.2.9200.23332"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160002" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160002" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160002" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160001" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160005" comment="wlansvc.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160006" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160005" comment="wlansvc.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160007" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160008" comment="wlansvc.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160008" comment="wlansvc.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160007" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160008" comment="wlansvc.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160007" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160008" comment="wlansvc.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160009" comment="wlansvc.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160010" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160009" comment="wlansvc.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160011" comment="wlansvc.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160012" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160011" comment="wlansvc.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160012" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160011" comment="wlansvc.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160013" comment="wlansvc.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160014" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160013" comment="wlansvc.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160016" comment="wlansvc.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160017" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160016" comment="wlansvc.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160017" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160016" comment="wlansvc.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283160016" comment="wlansvc.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283170000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283170000.xml
new file mode 100644
index 00000000000..1f76a5d0627
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283170000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283170000" version="0">
+  <metadata>
+    <title>Microsoft Windows Codecs Library Information Disclosure Vulnerability - CVE-2021-28317</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28317" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28317"/>
+    <reference ref_id="MSRC-CVE-2021-28317" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28317"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170002" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170002" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170002" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170003" comment="windowscodecs.dll (7.x) version is less than 7.0.6003.21090"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170004" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170005" comment="windowscodecs.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170004" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170005" comment="windowscodecs.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170002" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170002" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170002" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170001" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170006" comment="windowscodecs.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170007" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170006" comment="windowscodecs.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170008" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170009" comment="windowscodecs.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170009" comment="windowscodecs.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170008" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170009" comment="windowscodecs.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170008" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170009" comment="windowscodecs.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170010" comment="windowscodecs.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170011" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170010" comment="windowscodecs.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170012" comment="windowscodecs.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170013" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170012" comment="windowscodecs.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170013" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170012" comment="windowscodecs.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170014" comment="windowscodecs.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170015" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170014" comment="windowscodecs.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170017" comment="windowscodecs.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170018" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170017" comment="windowscodecs.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170018" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170017" comment="windowscodecs.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170017" comment="windowscodecs.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170003" comment="windowscodecs.dll (7.x) version is less than 7.0.6003.21090"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170020" comment="windowscodecs.dll (32-bit) (7.x) version is less than 7.0.6003.21090"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170003" comment="windowscodecs.dll (7.x) version is less than 7.0.6003.21090"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170020" comment="windowscodecs.dll (32-bit) (7.x) version is less than 7.0.6003.21090"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283170003" comment="windowscodecs.dll (7.x) version is less than 7.0.6003.21090"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283180000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283180000.xml
new file mode 100644
index 00000000000..4e5b2310506
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283180000.xml
@@ -0,0 +1,182 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283180000" version="0">
+  <metadata>
+    <title>Windows GDI+ Information Disclosure Vulnerability - CVE-2021-28318</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28318" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28318"/>
+    <reference ref_id="MSRC-CVE-2021-28318" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28318"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283190000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283190000.xml
new file mode 100644
index 00000000000..b1d7c5e7801
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283190000.xml
@@ -0,0 +1,89 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283190000" version="0">
+  <metadata>
+    <title>Windows TCP/IP Driver Denial of Service Vulnerability - CVE-2021-28319</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28319" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28319"/>
+    <reference ref_id="MSRC-CVE-2021-28319" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28319"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190001" comment="tcpip.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190002" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190001" comment="tcpip.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190004" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190004" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190005" comment="tcpip.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190006" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190005" comment="tcpip.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190009" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190009" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283200000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283200000.xml
new file mode 100644
index 00000000000..4b1b23ada4e
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283200000.xml
@@ -0,0 +1,128 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283200000" version="0">
+  <metadata>
+    <title>Windows Resource Manager PSM Service Extension Elevation of Privilege Vulnerability - CVE-2021-28320</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28320" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28320"/>
+    <reference ref_id="MSRC-CVE-2021-28320" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28320"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200001" comment="psmserviceexthost.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200002" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200001" comment="psmserviceexthost.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200003" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200004" comment="psmserviceexthost.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200004" comment="psmserviceexthost.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200003" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200004" comment="psmserviceexthost.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200003" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200004" comment="psmserviceexthost.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200005" comment="psmserviceexthost.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200006" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200005" comment="psmserviceexthost.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200007" comment="psmserviceexthost.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200008" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200007" comment="psmserviceexthost.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200008" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200007" comment="psmserviceexthost.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200009" comment="psmserviceexthost.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200010" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200009" comment="psmserviceexthost.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200012" comment="psmserviceexthost.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200013" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200012" comment="psmserviceexthost.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200013" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200012" comment="psmserviceexthost.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283200012" comment="psmserviceexthost.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283230000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283230000.xml
new file mode 100644
index 00000000000..13a3d4e0781
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283230000.xml
@@ -0,0 +1,289 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283230000" version="0">
+  <metadata>
+    <title>Windows DNS Information Disclosure Vulnerability - CVE-2021-28323</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28323" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28323"/>
+    <reference ref_id="MSRC-CVE-2021-28323" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28323"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230006" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230007" comment="dnsapi.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230006" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230007" comment="dnsapi.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230008" comment="dnsapi.dll (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230009" comment="dnsrslvr.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230010" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230011" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230008" comment="dnsapi.dll (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230009" comment="dnsrslvr.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230012" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230013" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230012" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230013" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230012" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230013" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230016" comment="dnsapi.dll (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230017" comment="dnsrslvr.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230018" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230019" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230016" comment="dnsapi.dll (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230017" comment="dnsrslvr.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230020" comment="dnsapi.dll (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230021" comment="dnsrslvr.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230022" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230023" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230020" comment="dnsapi.dll (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230021" comment="dnsrslvr.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230022" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230023" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230020" comment="dnsapi.dll (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230021" comment="dnsrslvr.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230024" comment="dnsapi.dll (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230025" comment="dnsrslvr.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230026" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230027" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230024" comment="dnsapi.dll (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230025" comment="dnsrslvr.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230031" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230032" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230031" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230032" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230034" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230035" comment="dnscacheugc.exe (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230036" comment="dnsrslvr.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230034" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230035" comment="dnscacheugc.exe (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230036" comment="dnsrslvr.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283240000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283240000.xml
new file mode 100644
index 00000000000..12e0010e16f
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283240000.xml
@@ -0,0 +1,45 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283240000" version="0">
+  <metadata>
+    <title>Windows SMB Information Disclosure Vulnerability - CVE-2021-28324</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28324" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28324"/>
+    <reference ref_id="MSRC-CVE-2021-28324" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28324"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240003" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240003" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283250000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283250000.xml
new file mode 100644
index 00000000000..ecd10292d99
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283250000.xml
@@ -0,0 +1,172 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283250000" version="0">
+  <metadata>
+    <title>Windows SMB Information Disclosure Vulnerability - CVE-2021-28325</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28325" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28325"/>
+    <reference ref_id="MSRC-CVE-2021-28325" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28325"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250001" comment="srv2.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250002" comment="srv2.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250001" comment="srv2.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250002" comment="srv2.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250003" comment="srv2.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250004" comment="srv2.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250003" comment="srv2.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250004" comment="srv2.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250003" comment="srv2.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250004" comment="srv2.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250003" comment="srv2.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250005" comment="srv2.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250006" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250005" comment="srv2.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250007" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250008" comment="srv2.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250008" comment="srv2.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250007" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250008" comment="srv2.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250007" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250008" comment="srv2.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250009" comment="srv2.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250010" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250009" comment="srv2.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250011" comment="srv2.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250012" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250011" comment="srv2.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250012" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250011" comment="srv2.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250013" comment="srv2.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250014" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283250013" comment="srv2.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240003" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240003" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283240002" comment="srv2.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283260000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283260000.xml
new file mode 100644
index 00000000000..45b77feb533
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283260000.xml
@@ -0,0 +1,128 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283260000" version="0">
+  <metadata>
+    <title>Windows AppX Deployment Server Denial of Service Vulnerability - CVE-2021-28326</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28326" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28326"/>
+    <reference ref_id="MSRC-CVE-2021-28326" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28326"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260001" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260002" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260001" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260003" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260004" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260004" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260003" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260004" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260003" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260004" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260005" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260006" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260005" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260007" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260008" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260007" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260008" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260007" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260009" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260010" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260009" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260012" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260013" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260012" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260013" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260012" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283260012" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283270000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283270000.xml
new file mode 100644
index 00000000000..df6de47439a
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283270000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283270000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28327</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28327" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28327"/>
+    <reference ref_id="MSRC-CVE-2021-28327" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28327"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283280000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283280000.xml
new file mode 100644
index 00000000000..dd0cf4c54b2
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283280000.xml
@@ -0,0 +1,289 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283280000" version="0">
+  <metadata>
+    <title>Windows DNS Information Disclosure Vulnerability - CVE-2021-28328</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28328" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28328"/>
+    <reference ref_id="MSRC-CVE-2021-28328" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28328"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230006" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230007" comment="dnsapi.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230006" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230007" comment="dnsapi.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230002" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230001" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230008" comment="dnsapi.dll (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230009" comment="dnsrslvr.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230010" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230011" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230008" comment="dnsapi.dll (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230009" comment="dnsrslvr.dll (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230012" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230013" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230012" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230013" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230012" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230013" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230014" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230015" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230016" comment="dnsapi.dll (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230017" comment="dnsrslvr.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230018" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230019" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230016" comment="dnsapi.dll (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230017" comment="dnsrslvr.dll (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230020" comment="dnsapi.dll (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230021" comment="dnsrslvr.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230022" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230023" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230020" comment="dnsapi.dll (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230021" comment="dnsrslvr.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230022" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230023" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230020" comment="dnsapi.dll (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230021" comment="dnsrslvr.dll (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230024" comment="dnsapi.dll (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230025" comment="dnsrslvr.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230026" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230027" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230024" comment="dnsapi.dll (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230025" comment="dnsrslvr.dll (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230031" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230032" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230031" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230032" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230029" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230030" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230034" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230035" comment="dnscacheugc.exe (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230036" comment="dnsrslvr.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230034" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230035" comment="dnscacheugc.exe (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230036" comment="dnsrslvr.dll (32-bit) (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230003" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230004" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283230005" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283290000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283290000.xml
new file mode 100644
index 00000000000..5d40a69e23a
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283290000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283290000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28329</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28329" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28329"/>
+    <reference ref_id="MSRC-CVE-2021-28329" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28329"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283300000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283300000.xml
new file mode 100644
index 00000000000..bf4af510bab
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283300000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283300000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28330</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28330" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28330"/>
+    <reference ref_id="MSRC-CVE-2021-28330" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28330"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283310000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283310000.xml
new file mode 100644
index 00000000000..feff93f79ae
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283310000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283310000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28331</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28331" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28331"/>
+    <reference ref_id="MSRC-CVE-2021-28331" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28331"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283320000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283320000.xml
new file mode 100644
index 00000000000..c70c8f087f7
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283320000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283320000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28332</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28332" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28332"/>
+    <reference ref_id="MSRC-CVE-2021-28332" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28332"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283330000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283330000.xml
new file mode 100644
index 00000000000..51a259393d4
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283330000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283330000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28333</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28333" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28333"/>
+    <reference ref_id="MSRC-CVE-2021-28333" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28333"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283340000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283340000.xml
new file mode 100644
index 00000000000..4ca442a1c1a
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283340000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283340000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28334</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28334" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28334"/>
+    <reference ref_id="MSRC-CVE-2021-28334" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28334"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283350000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283350000.xml
new file mode 100644
index 00000000000..a1aa6e64969
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283350000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283350000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28335</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28335" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28335"/>
+    <reference ref_id="MSRC-CVE-2021-28335" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28335"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283360000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283360000.xml
new file mode 100644
index 00000000000..033b8382ca0
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283360000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283360000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28336</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28336" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28336"/>
+    <reference ref_id="MSRC-CVE-2021-28336" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28336"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283370000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283370000.xml
new file mode 100644
index 00000000000..aa30b0dc84f
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283370000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283370000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28337</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28337" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28337"/>
+    <reference ref_id="MSRC-CVE-2021-28337" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28337"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283380000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283380000.xml
new file mode 100644
index 00000000000..74113134816
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283380000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283380000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28338</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28338" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28338"/>
+    <reference ref_id="MSRC-CVE-2021-28338" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28338"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283390000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283390000.xml
new file mode 100644
index 00000000000..afe8956ee3d
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283390000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283390000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28339</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28339" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28339"/>
+    <reference ref_id="MSRC-CVE-2021-28339" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28339"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283400000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283400000.xml
new file mode 100644
index 00000000000..0068e105f95
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283400000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283400000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28340</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28340" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28340"/>
+    <reference ref_id="MSRC-CVE-2021-28340" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28340"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283410000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283410000.xml
new file mode 100644
index 00000000000..589cd29c957
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283410000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283410000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28341</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28341" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28341"/>
+    <reference ref_id="MSRC-CVE-2021-28341" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28341"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283420000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283420000.xml
new file mode 100644
index 00000000000..6af33385af5
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283420000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283420000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28342</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28342" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28342"/>
+    <reference ref_id="MSRC-CVE-2021-28342" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28342"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283430000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283430000.xml
new file mode 100644
index 00000000000..1bd072bc622
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283430000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283430000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28343</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28343" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28343"/>
+    <reference ref_id="MSRC-CVE-2021-28343" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28343"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283440000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283440000.xml
new file mode 100644
index 00000000000..05b9ff3bb83
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283440000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283440000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28344</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28344" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28344"/>
+    <reference ref_id="MSRC-CVE-2021-28344" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28344"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283450000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283450000.xml
new file mode 100644
index 00000000000..950155ca393
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283450000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283450000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28345</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28345" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28345"/>
+    <reference ref_id="MSRC-CVE-2021-28345" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28345"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283460000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283460000.xml
new file mode 100644
index 00000000000..e2d525ce796
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283460000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283460000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28346</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28346" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28346"/>
+    <reference ref_id="MSRC-CVE-2021-28346" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28346"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283470000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283470000.xml
new file mode 100644
index 00000000000..15a21452759
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283470000.xml
@@ -0,0 +1,173 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283470000" version="0">
+  <metadata>
+    <title>Windows Speech Runtime Elevation of Privilege Vulnerability - CVE-2021-28347</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28347" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28347"/>
+    <reference ref_id="MSRC-CVE-2021-28347" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28347"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 (Server Core installation) has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criteria comment="KB5001339 (or a superceding KB) for Windows 10 Version 1803 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10913" comment="Current Windows build is 17134"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470006" comment="Current Windows revision number less than 2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria comment="KB5001339 (or a superceding KB) for Windows 10 Version 1803 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10913" comment="Current Windows build is 17134"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470006" comment="Current Windows revision number less than 2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows 10 Version 1809 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows 10 Version 1809 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows Server 2019 has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria comment="KB5001337 (or a superceding KB) for Windows 10 Version 1909 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:12964" comment="Current Windows build is 18363"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470010" comment="Current Windows revision number less than 1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria comment="KB5001337 (or a superceding KB) for Windows 10 Version 1909 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:12964" comment="Current Windows build is 18363"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470010" comment="Current Windows revision number less than 1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 2004 for 32-bit Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 2004 for x64-based Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 20H2 for x64-based Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 20H2 for 32-bit Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283480000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283480000.xml
new file mode 100644
index 00000000000..180c6e10c9d
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283480000.xml
@@ -0,0 +1,182 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283480000" version="0">
+  <metadata>
+    <title>Windows GDI+ Remote Code Execution Vulnerability - CVE-2021-28348</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28348" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28348"/>
+    <reference ref_id="MSRC-CVE-2021-28348" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28348"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283490000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283490000.xml
new file mode 100644
index 00000000000..aed5782f592
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283490000.xml
@@ -0,0 +1,182 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283490000" version="0">
+  <metadata>
+    <title>Windows GDI+ Remote Code Execution Vulnerability - CVE-2021-28349</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28349" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28349"/>
+    <reference ref_id="MSRC-CVE-2021-28349" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28349"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283500000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283500000.xml
new file mode 100644
index 00000000000..074a8e3a437
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283500000.xml
@@ -0,0 +1,182 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283500000" version="0">
+  <metadata>
+    <title>Windows GDI+ Remote Code Execution Vulnerability - CVE-2021-28350</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28350" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28350"/>
+    <reference ref_id="MSRC-CVE-2021-28350" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28350"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180004" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180005" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180001" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180006" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180007" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180008" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180009" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180010" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180012" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180002" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283180003" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283510000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283510000.xml
new file mode 100644
index 00000000000..2795c167e72
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283510000.xml
@@ -0,0 +1,173 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283510000" version="0">
+  <metadata>
+    <title>Windows Speech Runtime Elevation of Privilege Vulnerability - CVE-2021-28351</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28351" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28351"/>
+    <reference ref_id="MSRC-CVE-2021-28351" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28351"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 (Server Core installation) has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criteria comment="KB5001339 (or a superceding KB) for Windows 10 Version 1803 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10913" comment="Current Windows build is 17134"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470006" comment="Current Windows revision number less than 2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria comment="KB5001339 (or a superceding KB) for Windows 10 Version 1803 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10913" comment="Current Windows build is 17134"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470006" comment="Current Windows revision number less than 2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows 10 Version 1809 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows 10 Version 1809 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows Server 2019 has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria comment="KB5001337 (or a superceding KB) for Windows 10 Version 1909 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:12964" comment="Current Windows build is 18363"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470010" comment="Current Windows revision number less than 1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria comment="KB5001337 (or a superceding KB) for Windows 10 Version 1909 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:12964" comment="Current Windows build is 18363"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470010" comment="Current Windows revision number less than 1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 2004 for 32-bit Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 2004 for x64-based Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 20H2 for x64-based Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 20H2 for 32-bit Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283520000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283520000.xml
new file mode 100644
index 00000000000..eaa724ddfa3
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283520000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283520000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28352</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28352" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28352"/>
+    <reference ref_id="MSRC-CVE-2021-28352" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28352"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283530000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283530000.xml
new file mode 100644
index 00000000000..b80826fcbde
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283530000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283530000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28353</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28353" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28353"/>
+    <reference ref_id="MSRC-CVE-2021-28353" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28353"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283540000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283540000.xml
new file mode 100644
index 00000000000..88bc4d846f2
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283540000.xml
@@ -0,0 +1,228 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283540000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28354</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28354" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28354"/>
+    <reference ref_id="MSRC-CVE-2021-28354" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28354"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283550000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283550000.xml
new file mode 100644
index 00000000000..ae05aaebd5e
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283550000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283550000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28355</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28355" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28355"/>
+    <reference ref_id="MSRC-CVE-2021-28355" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28355"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283560000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283560000.xml
new file mode 100644
index 00000000000..3f3bb82d523
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283560000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283560000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28356</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28356" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28356"/>
+    <reference ref_id="MSRC-CVE-2021-28356" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28356"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283570000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283570000.xml
new file mode 100644
index 00000000000..d33eee0e60e
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283570000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283570000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28357</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28357" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28357"/>
+    <reference ref_id="MSRC-CVE-2021-28357" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28357"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283580000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283580000.xml
new file mode 100644
index 00000000000..99b3b04ebf0
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021283580000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021283580000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28358</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28358" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28358"/>
+    <reference ref_id="MSRC-CVE-2021-28358" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28358"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284340000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284340000.xml
new file mode 100644
index 00000000000..50ba524d254
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284340000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284340000" version="0">
+  <metadata>
+    <title>Remote Procedure Call Runtime Remote Code Execution Vulnerability - CVE-2021-28434</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28434" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28434"/>
+    <reference ref_id="MSRC-CVE-2021-28434" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28434"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270004" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270005" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270002" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270001" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270007" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270006" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270008" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270009" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270011" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270010" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270013" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270012" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270015" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270014" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270018" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270017" comment="msrpc.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270020" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283270003" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284350000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284350000.xml
new file mode 100644
index 00000000000..7c7a291b998
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284350000.xml
@@ -0,0 +1,156 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284350000" version="0">
+  <metadata>
+    <title>Windows Event Tracing Information Disclosure Vulnerability - CVE-2021-28435</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28435" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28435"/>
+    <reference ref_id="MSRC-CVE-2021-28435" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28435"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930002" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930006" comment="ntoskrnl.exe (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930007" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930006" comment="ntoskrnl.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930008" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930009" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880002" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880001" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880004" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880003" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880006" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880005" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880009" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270880008" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284360000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284360000.xml
new file mode 100644
index 00000000000..da739d16a6d
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284360000.xml
@@ -0,0 +1,173 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284360000" version="0">
+  <metadata>
+    <title>Windows Speech Runtime Elevation of Privilege Vulnerability - CVE-2021-28436</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28436" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28436"/>
+    <reference ref_id="MSRC-CVE-2021-28436" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28436"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 (Server Core installation) has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criteria comment="KB5001339 (or a superceding KB) for Windows 10 Version 1803 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10913" comment="Current Windows build is 17134"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470006" comment="Current Windows revision number less than 2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria comment="KB5001339 (or a superceding KB) for Windows 10 Version 1803 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10913" comment="Current Windows build is 17134"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470006" comment="Current Windows revision number less than 2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows 10 Version 1809 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows 10 Version 1809 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria comment="KB5001342 (or a superceding KB) for Windows Server 2019 has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:10995" comment="Current Windows build is 17763"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470008" comment="Current Windows revision number less than 1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria comment="KB5001337 (or a superceding KB) for Windows 10 Version 1909 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:12964" comment="Current Windows build is 18363"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470010" comment="Current Windows revision number less than 1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria comment="KB5001337 (or a superceding KB) for Windows 10 Version 1909 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:12964" comment="Current Windows build is 18363"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470010" comment="Current Windows revision number less than 1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 2004 for 32-bit Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 2004 for x64-based Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 20H2 for x64-based Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria comment="KB5001330 (or a superceding KB) for Windows 10 Version 20H2 for 32-bit Systems has not been installed based on the build and revision number." operator="OR">
+        <criteria comment="KB5001330 (or a superceding KB) for build 19041 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17304" comment="Current Windows build is 19041"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+        <criteria comment="KB5001330 (or a superceding KB) for build 19042 has not been installed" operator="AND">
+          <criterion test_ref="oval:org.cisecurity:tst:17530" comment="Current Windows build is 19042"/>
+          <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470013" comment="Current Windows revision number less than 928"/>
+        </criteria>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284370000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284370000.xml
new file mode 100644
index 00000000000..f8cba0bde14
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284370000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284370000" version="0">
+  <metadata>
+    <title>Windows Installer Information Disclosure Vulnerability - CVE-2021-28437</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28437" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28437"/>
+    <reference ref_id="MSRC-CVE-2021-28437" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28437"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130007" comment="msi.dll (32-bit) (5.x) version is less than 5.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130011" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130015" comment="msi.dll (32-bit) (5.x) version is less than 5.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284380000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284380000.xml
new file mode 100644
index 00000000000..e1b875be96c
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284380000.xml
@@ -0,0 +1,89 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284380000" version="0">
+  <metadata>
+    <title>Windows Console Driver Denial of Service Vulnerability - CVE-2021-28438</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28438" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28438"/>
+    <reference ref_id="MSRC-CVE-2021-28438" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28438"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380001" comment="condrv.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380002" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380001" comment="condrv.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380003" comment="condrv.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380004" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380003" comment="condrv.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380004" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380003" comment="condrv.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380005" comment="condrv.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380006" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380005" comment="condrv.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380009" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380009" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284390000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284390000.xml
new file mode 100644
index 00000000000..1fc44ac204a
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284390000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284390000" version="0">
+  <metadata>
+    <title>Windows TCP/IP Driver Denial of Service Vulnerability - CVE-2021-28439</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28439" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28439"/>
+    <reference ref_id="MSRC-CVE-2021-28439" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28439"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390002" comment="tcpip.sys (32-bit) (6.x) version is less than 6.3.9600.19984"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390002" comment="tcpip.sys (32-bit) (6.x) version is less than 6.3.9600.19984"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390002" comment="tcpip.sys (32-bit) (6.x) version is less than 6.3.9600.19984"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390003" comment="tcpip.sys (6.x) version is less than 6.0.6003.21088"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390004" comment="tcpip.sys (32-bit) (6.x) version is less than 6.2.9200.23320"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390005" comment="tcpip.sys (6.x) version is less than 6.2.9200.23320"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390004" comment="tcpip.sys (32-bit) (6.x) version is less than 6.2.9200.23320"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390005" comment="tcpip.sys (6.x) version is less than 6.2.9200.23320"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390002" comment="tcpip.sys (32-bit) (6.x) version is less than 6.3.9600.19984"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390002" comment="tcpip.sys (32-bit) (6.x) version is less than 6.3.9600.19984"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390002" comment="tcpip.sys (32-bit) (6.x) version is less than 6.3.9600.19984"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390001" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390006" comment="tcpip.sys (10.x) version is less than 10.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390007" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390006" comment="tcpip.sys (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390008" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390009" comment="tcpip.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390009" comment="tcpip.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390008" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390009" comment="tcpip.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390008" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390009" comment="tcpip.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190001" comment="tcpip.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190002" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190001" comment="tcpip.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190004" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190004" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190005" comment="tcpip.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190006" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190005" comment="tcpip.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190009" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190009" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390003" comment="tcpip.sys (6.x) version is less than 6.0.6003.21088"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390020" comment="tcpip.sys (32-bit) (6.x) version is less than 6.0.6003.21088"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390003" comment="tcpip.sys (6.x) version is less than 6.0.6003.21088"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390020" comment="tcpip.sys (32-bit) (6.x) version is less than 6.0.6003.21088"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284390003" comment="tcpip.sys (6.x) version is less than 6.0.6003.21088"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284400000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284400000.xml
new file mode 100644
index 00000000000..a4168202277
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284400000.xml
@@ -0,0 +1,232 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284400000" version="0">
+  <metadata>
+    <title>Windows Installer Elevation of Privilege Vulnerability - CVE-2021-28440</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28440" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28440"/>
+    <reference ref_id="MSRC-CVE-2021-28440" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28440"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130004" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130005" comment="msi.dll (5.x) version is less than 5.0.9200.23327"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130002" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130001" comment="msi.dll (5.x) version is less than 5.0.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130007" comment="msi.dll (32-bit) (5.x) version is less than 5.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130006" comment="msi.dll (5.x) version is less than 5.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130008" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130009" comment="msi.dll (5.x) version is less than 5.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130011" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130010" comment="msi.dll (5.x) version is less than 5.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130013" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130012" comment="msi.dll (5.x) version is less than 5.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130015" comment="msi.dll (32-bit) (5.x) version is less than 5.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130014" comment="msi.dll (5.x) version is less than 5.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130018" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130017" comment="msi.dll (5.x) version is less than 5.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130020" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264130003" comment="msi.dll (4.x) version is less than 4.5.6003.21095"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284410000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284410000.xml
new file mode 100644
index 00000000000..6a05bfc183f
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284410000.xml
@@ -0,0 +1,61 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284410000" version="0">
+  <metadata>
+    <title>Windows Hyper-V Information Disclosure Vulnerability - CVE-2021-28441</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28441" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28441"/>
+    <reference ref_id="MSRC-CVE-2021-28441" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28441"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160005" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160006" comment="hvax64.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284420000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284420000.xml
new file mode 100644
index 00000000000..f7bac84d92d
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284420000.xml
@@ -0,0 +1,89 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284420000" version="0">
+  <metadata>
+    <title>Windows TCP/IP Information Disclosure Vulnerability - CVE-2021-28442</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28442" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28442"/>
+    <reference ref_id="MSRC-CVE-2021-28442" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28442"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190001" comment="tcpip.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190002" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190001" comment="tcpip.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190004" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190004" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190003" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190005" comment="tcpip.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190006" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190005" comment="tcpip.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190009" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190009" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283190008" comment="tcpip.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284430000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284430000.xml
new file mode 100644
index 00000000000..a5f2340f0bb
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284430000.xml
@@ -0,0 +1,208 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284430000" version="0">
+  <metadata>
+    <title>Windows Console Driver Denial of Service Vulnerability - CVE-2021-28443</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28443" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28443"/>
+    <reference ref_id="MSRC-CVE-2021-28443" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28443"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="KB5001332 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="KB5001383 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910002" comment="KB5001383 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270910001" comment="KB5001393 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria comment="KB5001340 (or a superceding KB) for Windows 10 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11052" comment="Current Windows build is 10240"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270960004" comment="Current Windows revision number less than 18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for 32-bit Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows 10 Version 1607 for x64-based Systems has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria comment="KB5001347 (or a superceding KB) for Windows Server 2016 (Server Core installation) has not been installed based on the build and revision number." operator="AND">
+        <criterion test_ref="oval:org.cisecurity:tst:11207" comment="Current Windows build is 14393"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021283470004" comment="Current Windows revision number less than 4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380001" comment="condrv.sys (10.x) version is less than 10.0.17134.2145"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380002" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380001" comment="condrv.sys (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380003" comment="condrv.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380004" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380003" comment="condrv.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380004" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380003" comment="condrv.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380005" comment="condrv.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380006" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380005" comment="condrv.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380009" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380009" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284380008" comment="condrv.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="KB5001332 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="KB5001332 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270930003" comment="KB5001332 (or a superceding KB) has not been installed as indicated by the version of ntoskrnl.exe (6.x)"/>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284440000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284440000.xml
new file mode 100644
index 00000000000..03543a6230c
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284440000.xml
@@ -0,0 +1,124 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284440000" version="0">
+  <metadata>
+    <title>Windows Hyper-V Security Feature Bypass Vulnerability - CVE-2021-28444</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28444" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28444"/>
+    <reference ref_id="MSRC-CVE-2021-28444" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28444"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440001" comment="vmswitch.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440002" comment="vmswitch.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440001" comment="vmswitch.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440002" comment="vmswitch.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440001" comment="vmswitch.sys (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440002" comment="vmswitch.sys (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440004" comment="hvax64.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160001" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160002" comment="hvax64.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160001" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160002" comment="hvax64.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160001" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160002" comment="hvax64.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440007" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284440008" comment="hvax64.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160003" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160004" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160005" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160006" comment="hvax64.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160008" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021264160009" comment="hvax64.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284450000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284450000.xml
new file mode 100644
index 00000000000..e1c0e61766d
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284450000.xml
@@ -0,0 +1,233 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284450000" version="0">
+  <metadata>
+    <title>Windows Network File System Remote Code Execution Vulnerability - CVE-2021-28445</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28445" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28445"/>
+    <reference ref_id="MSRC-CVE-2021-28445" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28445"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description>N/A</description>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450002" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450002" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450002" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450003" comment="msnfsflt.sys (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450004" comment="nfssvr.sys (6.x) version is less than 6.0.6003.21091"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450005" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.2.9200.23326"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450006" comment="nfssvr.sys (6.x) version is less than 6.2.9200.23326"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450005" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.2.9200.23326"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450006" comment="nfssvr.sys (6.x) version is less than 6.2.9200.23326"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450002" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450002" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450002" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.3.9600.19988"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450001" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450007" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450008" comment="nfssvr.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450008" comment="nfssvr.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450007" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450008" comment="nfssvr.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450007" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450008" comment="nfssvr.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450009" comment="nfssvr.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450010" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450009" comment="nfssvr.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450010" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450009" comment="nfssvr.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450011" comment="msnfsflt.sys (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450012" comment="nfssvr.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450013" comment="msnfsflt.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450014" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450011" comment="msnfsflt.sys (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450012" comment="nfssvr.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450016" comment="msnfsflt.sys (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450017" comment="nfssvr.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450018" comment="msnfsflt.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450019" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450016" comment="msnfsflt.sys (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450017" comment="nfssvr.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450018" comment="msnfsflt.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450019" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450016" comment="msnfsflt.sys (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450017" comment="nfssvr.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450016" comment="msnfsflt.sys (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450017" comment="nfssvr.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450003" comment="msnfsflt.sys (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450004" comment="nfssvr.sys (6.x) version is less than 6.0.6003.21091"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450021" comment="msnfsflt.sys (32-bit) (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450022" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450003" comment="msnfsflt.sys (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450004" comment="nfssvr.sys (6.x) version is less than 6.0.6003.21091"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450021" comment="msnfsflt.sys (32-bit) (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450022" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450003" comment="msnfsflt.sys (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284450004" comment="nfssvr.sys (6.x) version is less than 6.0.6003.21091"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284460000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284460000.xml
new file mode 100644
index 00000000000..4033d4c6752
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284460000.xml
@@ -0,0 +1,208 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284460000" version="0">
+  <metadata>
+    <title>Windows Portmapping Information Disclosure Vulnerability - CVE-2021-28446</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 7</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2008</platform>
+      <platform>Microsoft Windows Server 2008 R2</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28446" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28446"/>
+    <reference ref_id="MSRC-CVE-2021-28446" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28446"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001332" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001332"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description>N/A</description>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:17">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows 7 for 32-bit Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for 32-bit Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12292"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 7 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows 7 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12627"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460002" comment="portmap.sys (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Microsoft Windows Server 2008 R2 x64 Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+        <extend_definition comment="Microsoft Windows Server 2008 R2 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3528"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460002" comment="portmap.sys (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 R2 for x64-based Systems Service Pack 1 is installed" definition_ref="oval:org.mitre.oval:def:12567"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460002" comment="portmap.sys (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460003" comment="portmap.sys (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460004" comment="portmap.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460005" comment="portmap.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460004" comment="portmap.sys (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460005" comment="portmap.sys (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460002" comment="portmap.sys (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460002" comment="portmap.sys (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460002" comment="portmap.sys (32-bit) (6.x) version is less than 6.3.9600.19987"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460001" comment="portmap.sys (6.x) version is less than 6.3.9600.19987"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460006" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460007" comment="portmap.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460007" comment="portmap.sys (10.x) version is less than 10.0.14393.4350"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460006" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460007" comment="portmap.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460006" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460007" comment="portmap.sys (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460008" comment="portmap.sys (10.x) version is less than 10.0.17763.1879"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460009" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460008" comment="portmap.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460009" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460008" comment="portmap.sys (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460010" comment="portmap.sys (10.x) version is less than 10.0.18362.1500"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460011" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460010" comment="portmap.sys (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460013" comment="portmap.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460014" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460013" comment="portmap.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460014" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460013" comment="portmap.sys (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460013" comment="portmap.sys (10.x) version is less than 10.0.19041.928"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for 32-bit Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:5653"/>
+      <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460003" comment="portmap.sys (6.x) version is less than 6.0.6003.21091"/>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460016" comment="portmap.sys (32-bit) (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460003" comment="portmap.sys (6.x) version is less than 6.0.6003.21091"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is vulnerable" operator="AND">
+      <criteria comment="Windows Server 2008 for x64-based Systems Service Pack 2 (Server Core installation) is installed" operator="AND">
+        <extend_definition comment="Windows Server 2008 for x64-based Systems Service Pack 2 is installed" definition_ref="oval:org.mitre.oval:def:6216"/>
+        <extend_definition comment="Microsoft Windows Server 2008 (Server Core) is installed" definition_ref="oval:org.cisecurity:def:3527"/>
+      </criteria>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460016" comment="portmap.sys (32-bit) (6.x) version is less than 6.0.6003.21091"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021284460003" comment="portmap.sys (6.x) version is less than 6.0.6003.21091"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284470000.xml b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284470000.xml
new file mode 100644
index 00000000000..6c5f6cd5f5f
--- /dev/null
+++ b/repository/definitions/vulnerability/oval_com.jovalcm.ms.cve_def_2021284470000.xml
@@ -0,0 +1,226 @@
+<definition xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" class="vulnerability" id="oval:com.jovalcm.ms.cve:def:2021284470000" version="0">
+  <metadata>
+    <title>Windows Early Launch Antimalware Driver Security Feature Bypass Vulnerability - CVE-2021-28447</title>
+    <affected family="windows">
+      <platform>Microsoft Windows 10</platform>
+      <platform>Microsoft Windows 8.1</platform>
+      <platform>Microsoft Windows Server 2012</platform>
+      <platform>Microsoft Windows Server 2012 R2</platform>
+      <platform>Microsoft Windows Server 2016</platform>
+      <platform>Microsoft Windows Server 2019</platform>
+    </affected>
+    <reference ref_id="CVE-2021-28447" source="CVE" ref_url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28447"/>
+    <reference ref_id="MSRC-CVE-2021-28447" source="Vendor Advisory" ref_url="https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2021-28447"/>
+    <reference ref_id="KB5001383" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001383"/>
+    <reference ref_id="KB5001393" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001393"/>
+    <reference ref_id="KB5001340" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001340"/>
+    <reference ref_id="KB5001347" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001347"/>
+    <reference ref_id="KB5001339" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001339"/>
+    <reference ref_id="KB5001342" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001342"/>
+    <reference ref_id="KB5001337" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001337"/>
+    <reference ref_id="KB5001330" source="Vendor Advisory" ref_url="https://support.microsoft.com/en-us/help/5001330"/>
+    <description/>
+    <oval_repository>
+      <dates>
+        <submitted date="2021-04-16T13:39:16">
+          <contributor organization="JovalCM.com">David Ries</contributor>
+        </submitted>
+      </dates>
+      <status>INITIAL SUBMISSION</status>
+      <min_schema_version>5.11.2</min_schema_version>
+    </oval_repository>
+  </metadata>
+  <criteria operator="OR">
+    <criteria comment="Windows Server 2012 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 is installed" definition_ref="oval:org.mitre.oval:def:16359"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940001" comment="winload.efi (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940002" comment="winload.exe (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940003" comment="winload.efi (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940004" comment="winload.exe (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3533"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940001" comment="winload.efi (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940002" comment="winload.exe (32-bit) (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940003" comment="winload.efi (6.x) version is less than 6.2.9200.23324"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940004" comment="winload.exe (6.x) version is less than 6.2.9200.23324"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for 32-bit systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for 32-bit systems is installed" definition_ref="oval:org.mitre.oval:def:20924"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 8.1 for x64-based systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 8.1 for x64-based systems is installed" definition_ref="oval:org.mitre.oval:def:20956"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940007" comment="winload.efi (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940008" comment="winload.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 is installed" definition_ref="oval:org.mitre.oval:def:18858"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940007" comment="winload.efi (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940008" comment="winload.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2012 R2 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2012 R2 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3536"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940007" comment="winload.efi (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940008" comment="winload.exe (32-bit) (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940005" comment="winload.efi (6.x) version is less than 6.3.9600.19994"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940006" comment="winload.exe (6.x) version is less than 6.3.9600.19994"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:380"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940009" comment="winload.efi (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940010" comment="winload.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940011" comment="winload.efi (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940012" comment="winload.exe (32-bit) (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940009" comment="winload.efi (10.x) version is less than 10.0.10240.18906"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940010" comment="winload.exe (10.x) version is less than 10.0.10240.18906"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 is installed" definition_ref="oval:org.cisecurity:def:1269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940013" comment="winload.efi (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940014" comment="winload.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:1377"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1607 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1607 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:1379"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940013" comment="winload.efi (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940014" comment="winload.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2016 (Server Core installation) is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2016 (Server Core installation) is installed" definition_ref="oval:org.cisecurity:def:3529"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940013" comment="winload.efi (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940014" comment="winload.exe (32-bit) (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940015" comment="winload.efi (10.x) version is less than 10.0.14393.4350"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940016" comment="winload.exe (10.x) version is less than 10.0.14393.4350"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5016"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940017" comment="winload.efi (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940018" comment="winload.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1803 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1803 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5014"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940019" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940020" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940017" comment="winload.efi (10.x) version is less than 10.0.17134.2145"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940018" comment="winload.exe (10.x) version is less than 10.0.17134.2145"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:5824"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940021" comment="winload.efi (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940022" comment="winload.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1809 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1809 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:5821"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940023" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940024" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940021" comment="winload.efi (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940022" comment="winload.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows Server 2019 is vulnerable" operator="AND">
+      <extend_definition comment="Windows Server 2019 is installed" definition_ref="oval:org.cisecurity:def:5761"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940023" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940024" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940021" comment="winload.efi (10.x) version is less than 10.0.17763.1879"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940022" comment="winload.exe (10.x) version is less than 10.0.17763.1879"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for 32-bit Systems is installed" definition_ref="oval:org.cisecurity:def:7269"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940025" comment="winload.efi (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940026" comment="winload.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 1909 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition comment="Windows 10 Version 1909 for x64-based Systems is installed" definition_ref="oval:org.cisecurity:def:7268"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940027" comment="winload.efi (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940028" comment="winload.exe (32-bit) (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940025" comment="winload.efi (10.x) version is less than 10.0.18362.1500"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940026" comment="winload.exe (10.x) version is less than 10.0.18362.1500"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8447" comment="Microsoft Windows 10 Version 2004 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 2004 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8477" comment="Microsoft Windows 10 Version 2004 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940032" comment="winload.efi (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940033" comment="winload.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for x64-based Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8452" comment="Microsoft Windows 10 Version 20H2 (x64) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940032" comment="winload.efi (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940033" comment="winload.exe (32-bit) (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+    <criteria comment="Windows 10 Version 20H2 for 32-bit Systems is vulnerable" operator="AND">
+      <extend_definition definition_ref="oval:org.cisecurity:def:8457" comment="Microsoft Windows 10 Version 20H2 (x86) is installed"/>
+      <criteria operator="OR">
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940030" comment="winload.efi (10.x) version is less than 10.0.19041.928"/>
+        <criterion test_ref="oval:com.jovalcm.ms.cve:tst:2021270940031" comment="winload.exe (10.x) version is less than 10.0.19041.928"/>
+      </criteria>
+    </criteria>
+  </criteria>
+</definition>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130003.xml b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130003.xml
new file mode 100644
index 00000000000..4208585caaa
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264130003" version="0" comment="msi.dll (5.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2971</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9260</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10721</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130005.xml b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130005.xml
new file mode 100644
index 00000000000..d95012ac230
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264130005" version="0" comment="msi.dll (32-bit version) (5.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1611</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10321</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10291</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130006.xml b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130006.xml
new file mode 100644
index 00000000000..1280d4304a6
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264130006" version="0" comment="msi.dll (4.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2971</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10869</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10921</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130008.xml b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130008.xml
new file mode 100644
index 00000000000..b2ab2338e0f
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264130000/oval_com.jovalcm.ms.cve_obj_2021264130008.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264130008" version="0" comment="msi.dll (32-bit version) (4.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1611</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10959</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10975</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160003.xml b/repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160003.xml
new file mode 100644
index 00000000000..236c7ef98c6
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264160003" version="0" comment="hvax64.exe (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1449</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10467</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9774</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160005.xml b/repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160005.xml
new file mode 100644
index 00000000000..0b897aef0f3
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264160000/oval_com.jovalcm.ms.cve_obj_2021264160005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264160005" version="0" comment="hvax64.exe (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2995</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9377</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10773</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170002.xml b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170002.xml
new file mode 100644
index 00000000000..efe1702367d
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264170002" version="0" comment="wof.sys">
+  <path var_ref="oval:org.cisecurity:var:1976" var_check="at least one"/>
+  <filename>wof.sys</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170003.xml b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170003.xml
new file mode 100644
index 00000000000..af5a9d1ee7b
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264170003" version="0" comment="wof.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021264170002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021264170001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021264170002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170004.xml b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170004.xml
new file mode 100644
index 00000000000..e3bdbe5deaf
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264170004" version="0" comment="wof.sys (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1979" var_check="at least one"/>
+  <filename>wof.sys</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170005.xml b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170005.xml
new file mode 100644
index 00000000000..5f9ba49a6b4
--- /dev/null
+++ b/repository/objects/windows/file_object/2021264170000/oval_com.jovalcm.ms.cve_obj_2021264170005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021264170005" version="0" comment="wof.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021264170004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021264170004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021264170005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720003.xml b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720003.xml
new file mode 100644
index 00000000000..59bec169820
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270720003" version="0" comment="win32k.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1480</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9357</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10226</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720005.xml b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720005.xml
new file mode 100644
index 00000000000..e0d3886c21d
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270720005" version="0" comment="win32k.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2911</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9299</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10195</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720007.xml b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720007.xml
new file mode 100644
index 00000000000..95be29389e5
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270720007" version="0" comment="win32kfull.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2883</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9927</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9435</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720009.xml b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720009.xml
new file mode 100644
index 00000000000..e09ce84792f
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720009.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270720009" version="0" comment="win32kfull.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1442</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9430</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10374</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720010.xml b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720010.xml
new file mode 100644
index 00000000000..0b9e905bcf1
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720010.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270720010" version="0" comment="win32k.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2911</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:16006</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:16170</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720011.xml b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720011.xml
new file mode 100644
index 00000000000..4a66a138915
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270720000/oval_com.jovalcm.ms.cve_obj_2021270720011.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270720011" version="0" comment="win32k.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1480</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:16334</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:16298</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790003.xml b/repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790003.xml
new file mode 100644
index 00000000000..c4459f7d92c
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270790003" version="0" comment="wmphoto.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:4334</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:16831</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:17000</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790005.xml b/repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790005.xml
new file mode 100644
index 00000000000..1f0d69dc6a0
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270790000/oval_com.jovalcm.ms.cve_obj_2021270790005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270790005" version="0" comment="wmphoto.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:4453</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:16925</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:16961</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860002.xml b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860002.xml
new file mode 100644
index 00000000000..73d419a0357
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270860002" version="0" comment="services.exe">
+  <path var_ref="oval:org.cisecurity:var:1983" var_check="at least one"/>
+  <filename>services.exe</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860003.xml b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860003.xml
new file mode 100644
index 00000000000..8052a1b2192
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270860003" version="0" comment="services.exe (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270860002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270860001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270860002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860004.xml b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860004.xml
new file mode 100644
index 00000000000..e35140880dd
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270860004" version="0" comment="services.exe (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1639" var_check="at least one"/>
+  <filename>services.exe</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860005.xml b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860005.xml
new file mode 100644
index 00000000000..e29a259b491
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270860000/oval_com.jovalcm.ms.cve_obj_2021270860005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270860005" version="0" comment="services.exe (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270860004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270860004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270860005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880003.xml b/repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880003.xml
new file mode 100644
index 00000000000..8916e8ea397
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270880003" version="0" comment="ntoskrnl.exe (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2930</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10408</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10587</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880005.xml b/repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880005.xml
new file mode 100644
index 00000000000..9389513e73b
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270880000/oval_com.jovalcm.ms.cve_obj_2021270880005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270880005" version="0" comment="ntoskrnl.exe (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1419</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10159</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9203</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890002.xml b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890002.xml
new file mode 100644
index 00000000000..6cdba052170
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270890002" version="0" comment="inetcomm.dll">
+  <path var_ref="oval:org.cisecurity:var:1983" var_check="at least one"/>
+  <filename>inetcomm.dll</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890003.xml b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890003.xml
new file mode 100644
index 00000000000..798d06aaedb
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270890003" version="0" comment="inetcomm.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270890002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890004.xml b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890004.xml
new file mode 100644
index 00000000000..a5aa7b24b28
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270890004" version="0" comment="inetcomm.dll (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1639" var_check="at least one"/>
+  <filename>inetcomm.dll</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890005.xml b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890005.xml
new file mode 100644
index 00000000000..b091427a22d
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270890005" version="0" comment="inetcomm.dll (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270890004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890006.xml b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890006.xml
new file mode 100644
index 00000000000..fab0ba45cff
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270890006" version="0" comment="inetcomm.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270890002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890012</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890013</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890007.xml b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890007.xml
new file mode 100644
index 00000000000..7c01aa0d36a
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270890000/oval_com.jovalcm.ms.cve_obj_2021270890007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270890007" version="0" comment="inetcomm.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270890004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890015</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270890016</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270910000/oval_com.jovalcm.ms.cve_obj_2021270910003.xml b/repository/objects/windows/file_object/2021270910000/oval_com.jovalcm.ms.cve_obj_2021270910003.xml
new file mode 100644
index 00000000000..efae2963bd7
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270910000/oval_com.jovalcm.ms.cve_obj_2021270910003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270910003" version="0" comment="ntoskrnl.exe (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2930</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9849</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9360</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270930000/oval_com.jovalcm.ms.cve_obj_2021270930005.xml b/repository/objects/windows/file_object/2021270930000/oval_com.jovalcm.ms.cve_obj_2021270930005.xml
new file mode 100644
index 00000000000..095623c151c
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270930000/oval_com.jovalcm.ms.cve_obj_2021270930005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270930005" version="0" comment="ntoskrnl.exe (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1419</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9767</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10327</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940002.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940002.xml
new file mode 100644
index 00000000000..4451793003d
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940002" version="0" comment="winload.efi (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1639" var_check="at least one"/>
+  <filename>winload.efi</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940003.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940003.xml
new file mode 100644
index 00000000000..24c399c2bca
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940003" version="0" comment="winload.efi (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940004.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940004.xml
new file mode 100644
index 00000000000..d365878e7d1
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940004" version="0" comment="winload.exe (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1639" var_check="at least one"/>
+  <filename>winload.exe</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940005.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940005.xml
new file mode 100644
index 00000000000..de3d1544550
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940005" version="0" comment="winload.exe (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940006.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940006.xml
new file mode 100644
index 00000000000..0e5e0372267
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940006.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940006" version="0" comment="winload.efi">
+  <path var_ref="oval:org.cisecurity:var:1983" var_check="at least one"/>
+  <filename>winload.efi</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940007.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940007.xml
new file mode 100644
index 00000000000..e844f0b247b
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940007" version="0" comment="winload.efi (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940006</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940007</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940008</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940008.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940008.xml
new file mode 100644
index 00000000000..963f06c5ad3
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940008.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940008" version="0" comment="winload.exe">
+  <path var_ref="oval:org.cisecurity:var:1983" var_check="at least one"/>
+  <filename>winload.exe</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940009.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940009.xml
new file mode 100644
index 00000000000..6082214733d
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940009.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940009" version="0" comment="winload.exe (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940008</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940010</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940011</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940010.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940010.xml
new file mode 100644
index 00000000000..e7f3c7af636
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940010.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940010" version="0" comment="winload.efi (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940006</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940017</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940018</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940011.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940011.xml
new file mode 100644
index 00000000000..0a5298ecd1b
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940011.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940011" version="0" comment="winload.exe (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940008</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940020</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940021</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940012.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940012.xml
new file mode 100644
index 00000000000..8706b0cbbd4
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940012.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940012" version="0" comment="winload.efi (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940023</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940024</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940013.xml b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940013.xml
new file mode 100644
index 00000000000..1cc6eec21a8
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270940000/oval_com.jovalcm.ms.cve_obj_2021270940013.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270940013" version="0" comment="winload.exe (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270940004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940026</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270940027</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950002.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950002.xml
new file mode 100644
index 00000000000..3ef69c5971a
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950002" version="0" comment="wmvdecod.dll">
+  <path var_ref="oval:org.cisecurity:var:1983" var_check="at least one"/>
+  <filename>wmvdecod.dll</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950003.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950003.xml
new file mode 100644
index 00000000000..615a987921c
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950003" version="0" comment="wmvdecod.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270950002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950004.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950004.xml
new file mode 100644
index 00000000000..1a99a4d0215
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950004" version="0" comment="wmvdecod.dll (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1639" var_check="at least one"/>
+  <filename>wmvdecod.dll</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950005.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950005.xml
new file mode 100644
index 00000000000..d459b0db5c2
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950005" version="0" comment="wmvdecod.dll (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270950004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950006.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950006.xml
new file mode 100644
index 00000000000..9b5945a39b2
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950006" version="0" comment="wmvdecod.dll (11.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270950002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950007</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950008</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950007.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950007.xml
new file mode 100644
index 00000000000..4125b421d87
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950007" version="0" comment="wmvdecod.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270950002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950012</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950013</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950008.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950008.xml
new file mode 100644
index 00000000000..63a25edf834
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950008.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950008" version="0" comment="wmvdecod.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270950004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950015</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950016</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950010.xml b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950010.xml
new file mode 100644
index 00000000000..65848f8c025
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270950000/oval_com.jovalcm.ms.cve_obj_2021270950010.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270950010" version="0" comment="wmvdecod.dll (32-bit version) (11.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021270950004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950030</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021270950031</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960007.xml b/repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960007.xml
new file mode 100644
index 00000000000..aa5021b17ca
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270960007" version="0" comment="ntfs.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3634</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15050</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14823</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960009.xml b/repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960009.xml
new file mode 100644
index 00000000000..6c676a2f725
--- /dev/null
+++ b/repository/objects/windows/file_object/2021270960000/oval_com.jovalcm.ms.cve_obj_2021270960009.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021270960009" version="0" comment="ntfs.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3742</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14857</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14783</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110002.xml b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110002.xml
new file mode 100644
index 00000000000..f79254b2daa
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283110002" version="0" comment="ahcache.sys (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1638" var_check="at least one"/>
+  <filename>ahcache.sys</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110003.xml b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110003.xml
new file mode 100644
index 00000000000..0096e213f62
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283110003" version="0" comment="ahcache.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021283110002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283110001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283110002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110004.xml b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110004.xml
new file mode 100644
index 00000000000..f3c5e44a6d7
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283110004" version="0" comment="ahcache.sys">
+  <path var_ref="oval:org.mitre.oval:var:201" var_check="at least one"/>
+  <filename>ahcache.sys</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110005.xml b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110005.xml
new file mode 100644
index 00000000000..44fc7eeecc9
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283110000/oval_com.jovalcm.ms.cve_obj_2021283110005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283110005" version="0" comment="ahcache.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021283110004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283110004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283110005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160003.xml b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160003.xml
new file mode 100644
index 00000000000..d729f029a52
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283160003" version="0" comment="wlansvc.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3069</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:13118</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:13322</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160005.xml b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160005.xml
new file mode 100644
index 00000000000..3ccf49a70fd
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283160005" version="0" comment="wlansvc.dll (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3116</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:13291</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:13230</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160006.xml b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160006.xml
new file mode 100644
index 00000000000..a1d2bfbdbe5
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283160006" version="0" comment="wlansvc.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3069</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:13217</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:13162</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160007.xml b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160007.xml
new file mode 100644
index 00000000000..8ed13796e20
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283160000/oval_com.jovalcm.ms.cve_obj_2021283160007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283160007" version="0" comment="wlansvc.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3116</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:13284</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:13173</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170003.xml b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170003.xml
new file mode 100644
index 00000000000..4407f24e920
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283170003" version="0" comment="windowscodecs.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2921</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:12233</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:12311</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170005.xml b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170005.xml
new file mode 100644
index 00000000000..234bbb4ccf4
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283170005" version="0" comment="windowscodecs.dll (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2813</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:12379</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:12299</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170006.xml b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170006.xml
new file mode 100644
index 00000000000..157acbbdc30
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283170006" version="0" comment="windowscodecs.dll (7.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2921</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:12433</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:12235</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170007.xml b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170007.xml
new file mode 100644
index 00000000000..08b13826e83
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283170007" version="0" comment="windowscodecs.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2921</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:12257</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:12325</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170008.xml b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170008.xml
new file mode 100644
index 00000000000..27eb2653824
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170008.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283170008" version="0" comment="windowscodecs.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2813</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:12339</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:12296</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170010.xml b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170010.xml
new file mode 100644
index 00000000000..93bd939ff12
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283170000/oval_com.jovalcm.ms.cve_obj_2021283170010.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283170010" version="0" comment="windowscodecs.dll (32-bit version) (7.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2813</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:12270</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:12340</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180003.xml b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180003.xml
new file mode 100644
index 00000000000..9ba70d5007a
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283180003" version="0" comment="gdiplus.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1695</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9587</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9252</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180004.xml b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180004.xml
new file mode 100644
index 00000000000..8dc2ea16a7c
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180004.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283180004" version="0" comment="gdiplus.dll (5.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1695</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9888</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9427</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180006.xml b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180006.xml
new file mode 100644
index 00000000000..dc6878dc6d6
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283180006" version="0" comment="gdi32.dll (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1396</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10080</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9730</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180008.xml b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180008.xml
new file mode 100644
index 00000000000..136931716c8
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180008.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283180008" version="0" comment="gdi32.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:2893</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9324</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10214</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180009.xml b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180009.xml
new file mode 100644
index 00000000000..6990256eaf1
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283180000/oval_com.jovalcm.ms.cve_obj_2021283180009.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283180009" version="0" comment="gdiplus.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1695</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9720</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10760</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190003.xml b/repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190003.xml
new file mode 100644
index 00000000000..95800060b65
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283190003" version="0" comment="tcpip.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1451</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9537</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10725</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190005.xml b/repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190005.xml
new file mode 100644
index 00000000000..a9c52f8e51e
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283190000/oval_com.jovalcm.ms.cve_obj_2021283190005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283190005" version="0" comment="tcpip.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1437</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10217</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9325</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200002.xml b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200002.xml
new file mode 100644
index 00000000000..427d66748bb
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283200002" version="0" comment="psmserviceexthost.dll">
+  <path var_ref="oval:org.cisecurity:var:1983" var_check="at least one"/>
+  <filename>psmserviceexthost.dll</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200003.xml b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200003.xml
new file mode 100644
index 00000000000..c4761459e02
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283200003" version="0" comment="psmserviceexthost.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021283200002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283200001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283200002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200004.xml b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200004.xml
new file mode 100644
index 00000000000..5b4a6f481a6
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283200004" version="0" comment="psmserviceexthost.dll (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1639" var_check="at least one"/>
+  <filename>psmserviceexthost.dll</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200005.xml b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200005.xml
new file mode 100644
index 00000000000..5e2b9e26008
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283200000/oval_com.jovalcm.ms.cve_obj_2021283200005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283200005" version="0" comment="psmserviceexthost.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021283200004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283200004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021283200005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230003.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230003.xml
new file mode 100644
index 00000000000..41c5b22a4b5
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230003" version="0" comment="dnsapi.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3490</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14487</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14133</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230005.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230005.xml
new file mode 100644
index 00000000000..e26ef43b27c
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230005" version="0" comment="dnsapi.dll (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3423</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:13925</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14319</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230007.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230007.xml
new file mode 100644
index 00000000000..5678780b5da
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230007" version="0" comment="dnscacheugc.exe (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3485</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14371</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14036</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230009.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230009.xml
new file mode 100644
index 00000000000..b8640a2d98e
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230009.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230009" version="0" comment="dnsrslvr.dll (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3418</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14298</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14396</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230010.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230010.xml
new file mode 100644
index 00000000000..0aa2d5f4e0a
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230010.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230010" version="0" comment="dnsapi.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3490</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14021</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14112</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230011.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230011.xml
new file mode 100644
index 00000000000..b1ab22f501e
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230011.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230011" version="0" comment="dnsrslvr.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3418</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14082</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14102</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230012.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230012.xml
new file mode 100644
index 00000000000..836f89e2634
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230012.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230012" version="0" comment="dnsapi.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3423</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14088</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14330</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230014.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230014.xml
new file mode 100644
index 00000000000..7f55ffdb2ba
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230014.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230014" version="0" comment="dnsrslvr.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3608</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14093</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14038</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230017.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230017.xml
new file mode 100644
index 00000000000..91a7ea850c4
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230017.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230017" version="0" comment="dnscacheugc.exe (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3457</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14229</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14346</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230018.xml b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230018.xml
new file mode 100644
index 00000000000..5b5ee735a0f
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283230000/oval_com.jovalcm.ms.cve_obj_2021283230018.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283230018" version="0" comment="dnsrslvr.dll (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3608</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14423</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:13968</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240004.xml b/repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240004.xml
new file mode 100644
index 00000000000..ae6626f9f99
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240004.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283240004" version="0" comment="srv2.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1440</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15796</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15809</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240006.xml b/repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240006.xml
new file mode 100644
index 00000000000..236fb8c67cc
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283240000/oval_com.jovalcm.ms.cve_obj_2021283240006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283240006" version="0" comment="srv2.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1411</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15789</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15791</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250003.xml b/repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250003.xml
new file mode 100644
index 00000000000..5282f6cf92f
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283250003" version="0" comment="srv2.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1411</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15819</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15845</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250005.xml b/repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250005.xml
new file mode 100644
index 00000000000..935e9565961
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283250000/oval_com.jovalcm.ms.cve_obj_2021283250005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283250005" version="0" comment="srv2.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1440</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15802</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15824</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260003.xml b/repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260003.xml
new file mode 100644
index 00000000000..4d097a345ec
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283260003" version="0" comment="appxdeploymentserver.dll (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3426</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:13958</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14225</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260005.xml b/repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260005.xml
new file mode 100644
index 00000000000..2c82cb38ebb
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283260000/oval_com.jovalcm.ms.cve_obj_2021283260005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283260005" version="0" comment="appxdeploymentserver.dll (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3445</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:14321</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:14311</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270003.xml b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270003.xml
new file mode 100644
index 00000000000..f22047844b1
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283270003" version="0" comment="msrpc.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1429</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10882</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10948</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270005.xml b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270005.xml
new file mode 100644
index 00000000000..1bd8bf37a16
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283270005" version="0" comment="msrpc.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1426</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10982</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10946</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270006.xml b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270006.xml
new file mode 100644
index 00000000000..e87d90d2ff4
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283270006" version="0" comment="msrpc.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1429</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10870</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:11008</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270007.xml b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270007.xml
new file mode 100644
index 00000000000..7c46e0b567d
--- /dev/null
+++ b/repository/objects/windows/file_object/2021283270000/oval_com.jovalcm.ms.cve_obj_2021283270007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021283270007" version="0" comment="msrpc.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1426</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10943</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10885</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380003.xml b/repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380003.xml
new file mode 100644
index 00000000000..b3f7d3e0556
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284380003" version="0" comment="condrv.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:4264</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:16411</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:16565</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380005.xml b/repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380005.xml
new file mode 100644
index 00000000000..3e485f3418e
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284380000/oval_com.jovalcm.ms.cve_obj_2021284380005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284380005" version="0" comment="condrv.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:4222</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:16504</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:16522</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390003.xml b/repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390003.xml
new file mode 100644
index 00000000000..3406aaf5b6f
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284390003" version="0" comment="tcpip.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1451</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10599</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10589</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390005.xml b/repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390005.xml
new file mode 100644
index 00000000000..399403b25d4
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284390000/oval_com.jovalcm.ms.cve_obj_2021284390005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284390005" version="0" comment="tcpip.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:1437</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:10771</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:10612</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440003.xml b/repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440003.xml
new file mode 100644
index 00000000000..e1103d8e775
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284440003" version="0" comment="vmswitch.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:4254</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9796</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9456</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440005.xml b/repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440005.xml
new file mode 100644
index 00000000000..70c40209890
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284440000/oval_com.jovalcm.ms.cve_obj_2021284440005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284440005" version="0" comment="vmswitch.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:4208</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:9625</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:9531</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450003.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450003.xml
new file mode 100644
index 00000000000..7ba7a1f47fc
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450003" version="0" comment="nfssvr.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3920</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15693</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15745</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450005.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450005.xml
new file mode 100644
index 00000000000..7063af4936f
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450005" version="0" comment="nfssvr.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3924</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15701</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15581</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450007.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450007.xml
new file mode 100644
index 00000000000..16f9fe55551
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450007" version="0" comment="msnfsflt.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3969</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15613</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15716</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450008.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450008.xml
new file mode 100644
index 00000000000..afada040b3e
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450008.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450008" version="0" comment="nfssvr.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3924</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15523</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15471</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450009.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450009.xml
new file mode 100644
index 00000000000..7f1ffd716a6
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450009.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450009" version="0" comment="nfssvr.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3920</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15624</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15753</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450010.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450010.xml
new file mode 100644
index 00000000000..6d8821c65c1
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450010.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450010" version="0" comment="msnfsflt.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3969</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284450021</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284450022</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450012.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450012.xml
new file mode 100644
index 00000000000..5de7ecba377
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450012.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450012" version="0" comment="msnfsflt.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3977</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284450025</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284450026</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450014.xml b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450014.xml
new file mode 100644
index 00000000000..1f6347a0a62
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284450000/oval_com.jovalcm.ms.cve_obj_2021284450014.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284450014" version="0" comment="msnfsflt.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:org.cisecurity:obj:3977</object_reference>
+    <filter action="exclude">oval:org.cisecurity:ste:15520</filter>
+    <filter action="exclude">oval:org.cisecurity:ste:15537</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460002.xml b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460002.xml
new file mode 100644
index 00000000000..fbca0e5257f
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460002.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284460002" version="0" comment="portmap.sys">
+  <path var_ref="oval:org.mitre.oval:var:201" var_check="at least one"/>
+  <filename>portmap.sys</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460003.xml b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460003.xml
new file mode 100644
index 00000000000..bc2890bfe41
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460003.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284460003" version="0" comment="portmap.sys (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021284460002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460001</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460002</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460004.xml b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460004.xml
new file mode 100644
index 00000000000..c48eb6ee162
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460004.xml
@@ -0,0 +1,4 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284460004" version="0" comment="portmap.sys (32-bit version)">
+  <path var_ref="oval:org.cisecurity:var:1638" var_check="at least one"/>
+  <filename>portmap.sys</filename>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460005.xml b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460005.xml
new file mode 100644
index 00000000000..4cb9b349de6
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460005.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284460005" version="0" comment="portmap.sys (32-bit version) (6.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021284460004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460004</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460005</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460006.xml b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460006.xml
new file mode 100644
index 00000000000..f2cc35d6de6
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460006.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284460006" version="0" comment="portmap.sys (32-bit version) (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021284460004</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460010</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460011</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460007.xml b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460007.xml
new file mode 100644
index 00000000000..7120c4fab8d
--- /dev/null
+++ b/repository/objects/windows/file_object/2021284460000/oval_com.jovalcm.ms.cve_obj_2021284460007.xml
@@ -0,0 +1,7 @@
+<file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:obj:2021284460007" version="0" comment="portmap.sys (10.x)">
+  <set xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5">
+    <object_reference>oval:com.jovalcm.ms.cve:obj:2021284460002</object_reference>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460013</filter>
+    <filter action="exclude">oval:com.jovalcm.ms.cve:ste:2021284460014</filter>
+  </set>
+</file_object>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130003.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130003.xml
new file mode 100644
index 00000000000..465d78ee69a
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130003" version="0" comment="Version is less than 5.0.9600.19994">
+  <version datatype="version" operation="less than">5.0.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130006.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130006.xml
new file mode 100644
index 00000000000..8cd78013abc
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130006" version="0" comment="Version is less than 5.0.9600.19994">
+  <version datatype="version" operation="less than">5.0.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130009.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130009.xml
new file mode 100644
index 00000000000..03c199229b0
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130009" version="0" comment="Version is less than 4.5.6003.21095">
+  <version datatype="version" operation="less than">4.5.6003.21095</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130010.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130010.xml
new file mode 100644
index 00000000000..808a64c7f2d
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130010" version="0" comment="Version is less than 5.0.9200.23327">
+  <version datatype="version" operation="less than">5.0.9200.23327</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130011.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130011.xml
new file mode 100644
index 00000000000..c30cc816fd2
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130011" version="0" comment="Version is less than 5.0.9200.23327">
+  <version datatype="version" operation="less than">5.0.9200.23327</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130012.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130012.xml
new file mode 100644
index 00000000000..bfae55c8c56
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130012" version="0" comment="Version is less than 5.0.10240.18906">
+  <version datatype="version" operation="less than">5.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130013.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130013.xml
new file mode 100644
index 00000000000..0076727dd83
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130013" version="0" comment="Version is less than 5.0.10240.18906">
+  <version datatype="version" operation="less than">5.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130014.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130014.xml
new file mode 100644
index 00000000000..721ce0a6de4
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130014" version="0" comment="Version is less than 5.0.14393.4350">
+  <version datatype="version" operation="less than">5.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130015.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130015.xml
new file mode 100644
index 00000000000..df9657492b0
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130015" version="0" comment="Version is less than 5.0.14393.4350">
+  <version datatype="version" operation="less than">5.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130016.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130016.xml
new file mode 100644
index 00000000000..09064ad3039
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130016" version="0" comment="Version is less than 5.0.17134.2145">
+  <version datatype="version" operation="less than">5.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130017.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130017.xml
new file mode 100644
index 00000000000..5811501feb3
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130017" version="0" comment="Version is less than 5.0.17134.2145">
+  <version datatype="version" operation="less than">5.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130018.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130018.xml
new file mode 100644
index 00000000000..2100506f4d8
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130018" version="0" comment="Version is less than 5.0.17763.1879">
+  <version datatype="version" operation="less than">5.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130019.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130019.xml
new file mode 100644
index 00000000000..bdc6becde43
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130019" version="0" comment="Version is less than 5.0.17763.1879">
+  <version datatype="version" operation="less than">5.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130020.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130020.xml
new file mode 100644
index 00000000000..9948060eb6e
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130020" version="0" comment="Version is less than 5.0.18362.1500">
+  <version datatype="version" operation="less than">5.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130021.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130021.xml
new file mode 100644
index 00000000000..e1105f5d4ef
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130021" version="0" comment="Version is less than 5.0.18362.1500">
+  <version datatype="version" operation="less than">5.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130023.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130023.xml
new file mode 100644
index 00000000000..4f8568ee58f
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130023" version="0" comment="Version is less than 5.0.19041.928">
+  <version datatype="version" operation="less than">5.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130024.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130024.xml
new file mode 100644
index 00000000000..8cf576759c8
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130024" version="0" comment="Version is less than 5.0.19041.928">
+  <version datatype="version" operation="less than">5.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130028.xml b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130028.xml
new file mode 100644
index 00000000000..7bf2467958a
--- /dev/null
+++ b/repository/states/windows/file_state/2021264130000/oval_com.jovalcm.ms.cve_ste_2021264130028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264130028" version="0" comment="Version is less than 4.5.6003.21095">
+  <version datatype="version" operation="less than">4.5.6003.21095</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160003.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160003.xml
new file mode 100644
index 00000000000..5ca7051e1c6
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160003" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160006.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160006.xml
new file mode 100644
index 00000000000..891111ab167
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160006" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160007.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160007.xml
new file mode 100644
index 00000000000..7d2de7ea909
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160007" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160008.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160008.xml
new file mode 100644
index 00000000000..aa8161a6991
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160008" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160009.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160009.xml
new file mode 100644
index 00000000000..5eaa98c206a
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160009" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160010.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160010.xml
new file mode 100644
index 00000000000..ccd953b9834
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160010" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160012.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160012.xml
new file mode 100644
index 00000000000..6eca1071e0b
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160012" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160013.xml b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160013.xml
new file mode 100644
index 00000000000..c3195ccf2a0
--- /dev/null
+++ b/repository/states/windows/file_state/2021264160000/oval_com.jovalcm.ms.cve_ste_2021264160013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264160013" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170001.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170001.xml
new file mode 100644
index 00000000000..ebf0b9ecfd1
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170001" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170002.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170002.xml
new file mode 100644
index 00000000000..6347a261c12
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170002" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170003.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170003.xml
new file mode 100644
index 00000000000..74b26fefa66
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170003" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170004.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170004.xml
new file mode 100644
index 00000000000..7cd59bd6ac1
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170004" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170005.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170005.xml
new file mode 100644
index 00000000000..5b57d61b493
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170005" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170006.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170006.xml
new file mode 100644
index 00000000000..f5c112d3d7c
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170006" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170007.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170007.xml
new file mode 100644
index 00000000000..decb6c03fd4
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170007" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170008.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170008.xml
new file mode 100644
index 00000000000..1bff6dda48e
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170008" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170010.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170010.xml
new file mode 100644
index 00000000000..3281d499293
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170010" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170011.xml b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170011.xml
new file mode 100644
index 00000000000..0acea59d636
--- /dev/null
+++ b/repository/states/windows/file_state/2021264170000/oval_com.jovalcm.ms.cve_ste_2021264170011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021264170011" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720003.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720003.xml
new file mode 100644
index 00000000000..971e1d48253
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720003" version="0" comment="Version is less than 6.2.9200.23337">
+  <version datatype="version" operation="less than">6.2.9200.23337</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720006.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720006.xml
new file mode 100644
index 00000000000..5ce13f0ef25
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720006" version="0" comment="Version is less than 6.2.9200.23337">
+  <version datatype="version" operation="less than">6.2.9200.23337</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720007.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720007.xml
new file mode 100644
index 00000000000..bc2b041d8bf
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720007" version="0" comment="Version is less than 6.3.9600.19990">
+  <version datatype="version" operation="less than">6.3.9600.19990</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720008.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720008.xml
new file mode 100644
index 00000000000..95845ff4655
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720008" version="0" comment="Version is less than 6.3.9600.19990">
+  <version datatype="version" operation="less than">6.3.9600.19990</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720011.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720011.xml
new file mode 100644
index 00000000000..451d9e53ad5
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720011" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720014.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720014.xml
new file mode 100644
index 00000000000..58abba11e89
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720014" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720015.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720015.xml
new file mode 100644
index 00000000000..f94b042663f
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720015" version="0" comment="Version is less than 10.0.14393.4283">
+  <version datatype="version" operation="less than">10.0.14393.4283</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720016.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720016.xml
new file mode 100644
index 00000000000..997e3f9795b
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720016" version="0" comment="Version is less than 10.0.14393.4283">
+  <version datatype="version" operation="less than">10.0.14393.4283</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720017.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720017.xml
new file mode 100644
index 00000000000..baf877a11e6
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720017" version="0" comment="Version is less than 10.0.17134.2087">
+  <version datatype="version" operation="less than">10.0.17134.2087</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720018.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720018.xml
new file mode 100644
index 00000000000..cddbe07a194
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720018" version="0" comment="Version is less than 10.0.17134.2087">
+  <version datatype="version" operation="less than">10.0.17134.2087</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720019.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720019.xml
new file mode 100644
index 00000000000..69ce9f410ed
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720019" version="0" comment="Version is less than 10.0.17763.1852">
+  <version datatype="version" operation="less than">10.0.17763.1852</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720020.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720020.xml
new file mode 100644
index 00000000000..f89ed54bbb8
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720020" version="0" comment="Version is less than 10.0.17763.1852">
+  <version datatype="version" operation="less than">10.0.17763.1852</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720023.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720023.xml
new file mode 100644
index 00000000000..1c67c928293
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720023" version="0" comment="Version is less than 10.0.18362.1474">
+  <version datatype="version" operation="less than">10.0.18362.1474</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720026.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720026.xml
new file mode 100644
index 00000000000..6c9649040d2
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720026.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720026" version="0" comment="Version is less than 10.0.18362.1474">
+  <version datatype="version" operation="less than">10.0.18362.1474</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720028.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720028.xml
new file mode 100644
index 00000000000..f5f51b77ab3
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720028" version="0" comment="Version is less than 10.0.19041.906">
+  <version datatype="version" operation="less than">10.0.19041.906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720029.xml b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720029.xml
new file mode 100644
index 00000000000..af5976f2893
--- /dev/null
+++ b/repository/states/windows/file_state/2021270720000/oval_com.jovalcm.ms.cve_ste_2021270720029.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270720029" version="0" comment="Version is less than 10.0.19041.906">
+  <version datatype="version" operation="less than">10.0.19041.906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790003.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790003.xml
new file mode 100644
index 00000000000..b7fa3897129
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790003" version="0" comment="Version is less than 10.0.10240.18874">
+  <version datatype="version" operation="less than">10.0.10240.18874</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790006.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790006.xml
new file mode 100644
index 00000000000..7d24b931e52
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790006" version="0" comment="Version is less than 10.0.10240.18874">
+  <version datatype="version" operation="less than">10.0.10240.18874</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790007.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790007.xml
new file mode 100644
index 00000000000..b7c86284417
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790007" version="0" comment="Version is less than 10.0.14393.4283">
+  <version datatype="version" operation="less than">10.0.14393.4283</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790008.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790008.xml
new file mode 100644
index 00000000000..13b333dd7a7
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790008" version="0" comment="Version is less than 10.0.14393.4283">
+  <version datatype="version" operation="less than">10.0.14393.4283</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790009.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790009.xml
new file mode 100644
index 00000000000..75414930a6a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790009" version="0" comment="Version is less than 10.0.17134.2087">
+  <version datatype="version" operation="less than">10.0.17134.2087</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790010.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790010.xml
new file mode 100644
index 00000000000..ae13710124b
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790010" version="0" comment="Version is less than 10.0.17134.2087">
+  <version datatype="version" operation="less than">10.0.17134.2087</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790011.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790011.xml
new file mode 100644
index 00000000000..6203b9f35a2
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790011" version="0" comment="Version is less than 10.0.17763.1817">
+  <version datatype="version" operation="less than">10.0.17763.1817</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790012.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790012.xml
new file mode 100644
index 00000000000..d184d17b684
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790012" version="0" comment="Version is less than 10.0.17763.1817">
+  <version datatype="version" operation="less than">10.0.17763.1817</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790013.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790013.xml
new file mode 100644
index 00000000000..0d5f4f5e551
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790013" version="0" comment="Version is less than 10.0.18362.1440">
+  <version datatype="version" operation="less than">10.0.18362.1440</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790014.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790014.xml
new file mode 100644
index 00000000000..024810e045e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790014" version="0" comment="Version is less than 10.0.18362.1440">
+  <version datatype="version" operation="less than">10.0.18362.1440</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790016.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790016.xml
new file mode 100644
index 00000000000..f2c3b8b6268
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790016" version="0" comment="Version is less than 10.0.19041.867">
+  <version datatype="version" operation="less than">10.0.19041.867</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790017.xml b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790017.xml
new file mode 100644
index 00000000000..8bd7a9dfbd6
--- /dev/null
+++ b/repository/states/windows/file_state/2021270790000/oval_com.jovalcm.ms.cve_ste_2021270790017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270790017" version="0" comment="Version is less than 10.0.19041.867">
+  <version datatype="version" operation="less than">10.0.19041.867</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860001.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860001.xml
new file mode 100644
index 00000000000..6c9004c55e0
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860001" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860002.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860002.xml
new file mode 100644
index 00000000000..8af46466927
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860002" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860003.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860003.xml
new file mode 100644
index 00000000000..941edff716c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860003" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860004.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860004.xml
new file mode 100644
index 00000000000..4afaf03b549
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860004" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860005.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860005.xml
new file mode 100644
index 00000000000..611595c7f58
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860005" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860006.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860006.xml
new file mode 100644
index 00000000000..aeb48f49c1c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860006" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860007.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860007.xml
new file mode 100644
index 00000000000..6d1f42365c6
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860007" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860008.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860008.xml
new file mode 100644
index 00000000000..b86da38c742
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860008" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860009.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860009.xml
new file mode 100644
index 00000000000..25d21c54939
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860009" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860010.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860010.xml
new file mode 100644
index 00000000000..4aa3a859f6f
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860010" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860012.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860012.xml
new file mode 100644
index 00000000000..f859bf93e26
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860012" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860013.xml b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860013.xml
new file mode 100644
index 00000000000..87ca90b0930
--- /dev/null
+++ b/repository/states/windows/file_state/2021270860000/oval_com.jovalcm.ms.cve_ste_2021270860013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270860013" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880003.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880003.xml
new file mode 100644
index 00000000000..e6e28581c44
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880003" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880006.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880006.xml
new file mode 100644
index 00000000000..177ffa010f6
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880006" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880007.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880007.xml
new file mode 100644
index 00000000000..7f945eb253a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880007" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880008.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880008.xml
new file mode 100644
index 00000000000..798a092a975
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880008" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880009.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880009.xml
new file mode 100644
index 00000000000..c74485252e1
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880009" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880010.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880010.xml
new file mode 100644
index 00000000000..a246bc8ed56
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880010" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880012.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880012.xml
new file mode 100644
index 00000000000..a13a3dd080a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880012" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880013.xml b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880013.xml
new file mode 100644
index 00000000000..0aa53670541
--- /dev/null
+++ b/repository/states/windows/file_state/2021270880000/oval_com.jovalcm.ms.cve_ste_2021270880013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270880013" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890001.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890001.xml
new file mode 100644
index 00000000000..c2303c5c0cb
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890001" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890002.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890002.xml
new file mode 100644
index 00000000000..fae3b0ec98b
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890002" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890003.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890003.xml
new file mode 100644
index 00000000000..ed244add54b
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890003" version="0" comment="Version is less than 6.1.7601.24576">
+  <version datatype="version" operation="less than">6.1.7601.24576</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890004.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890004.xml
new file mode 100644
index 00000000000..ac8f1dad573
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890004" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890005.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890005.xml
new file mode 100644
index 00000000000..c2d60c0966a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890005" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890006.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890006.xml
new file mode 100644
index 00000000000..fd7a63aef5b
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890006" version="0" comment="Version is less than 6.1.7601.24576">
+  <version datatype="version" operation="less than">6.1.7601.24576</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890007.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890007.xml
new file mode 100644
index 00000000000..c8153007e22
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890007" version="0" comment="Version is less than 6.0.6003.21096">
+  <version datatype="version" operation="less than">6.0.6003.21096</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890008.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890008.xml
new file mode 100644
index 00000000000..add8216757e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890008" version="0" comment="Version is less than 6.2.9200.23328">
+  <version datatype="version" operation="less than">6.2.9200.23328</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890009.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890009.xml
new file mode 100644
index 00000000000..c22103ca8f8
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890009" version="0" comment="Version is less than 6.2.9200.23328">
+  <version datatype="version" operation="less than">6.2.9200.23328</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890010.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890010.xml
new file mode 100644
index 00000000000..6f8070be479
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890010" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890011.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890011.xml
new file mode 100644
index 00000000000..d8a89202a6d
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890011" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890012.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890012.xml
new file mode 100644
index 00000000000..1fe7220f70c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890012" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890013.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890013.xml
new file mode 100644
index 00000000000..26c3be5e0af
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890013" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890014.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890014.xml
new file mode 100644
index 00000000000..20a1b346945
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890014" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890015.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890015.xml
new file mode 100644
index 00000000000..036ecb92c31
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890015" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890016.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890016.xml
new file mode 100644
index 00000000000..bc5d1796d3c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890016" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890017.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890017.xml
new file mode 100644
index 00000000000..d8cfa816df6
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890017" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890018.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890018.xml
new file mode 100644
index 00000000000..67e412f4f8c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890018" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890019.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890019.xml
new file mode 100644
index 00000000000..a39e0906a40
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890019" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890020.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890020.xml
new file mode 100644
index 00000000000..b89730a6090
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890020" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890021.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890021.xml
new file mode 100644
index 00000000000..23d213139f5
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890021" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890022.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890022.xml
new file mode 100644
index 00000000000..1d6850f16eb
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890022" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890023.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890023.xml
new file mode 100644
index 00000000000..0d432267e69
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890023" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890024.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890024.xml
new file mode 100644
index 00000000000..b02432e14ca
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890024" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890025.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890025.xml
new file mode 100644
index 00000000000..45b209253b0
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890025.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890025" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890027.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890027.xml
new file mode 100644
index 00000000000..056bb57db88
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890027.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890027" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890028.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890028.xml
new file mode 100644
index 00000000000..33ee2c6103e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890028" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890030.xml b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890030.xml
new file mode 100644
index 00000000000..35650e73ca5
--- /dev/null
+++ b/repository/states/windows/file_state/2021270890000/oval_com.jovalcm.ms.cve_ste_2021270890030.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270890030" version="0" comment="Version is less than 6.0.6003.21096">
+  <version datatype="version" operation="less than">6.0.6003.21096</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910003.xml b/repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910003.xml
new file mode 100644
index 00000000000..a6440ab1114
--- /dev/null
+++ b/repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270910003" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910004.xml b/repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910004.xml
new file mode 100644
index 00000000000..445d2ad6e87
--- /dev/null
+++ b/repository/states/windows/file_state/2021270910000/oval_com.jovalcm.ms.cve_ste_2021270910004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270910004" version="0" comment="Version is less than 6.2.9200.23327">
+  <version datatype="version" operation="less than">6.2.9200.23327</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930006.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930006.xml
new file mode 100644
index 00000000000..400d11e3d64
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930006" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930007.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930007.xml
new file mode 100644
index 00000000000..08d8aadb5cd
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930007" version="0" comment="Version is less than 6.0.6003.21095">
+  <version datatype="version" operation="less than">6.0.6003.21095</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930008.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930008.xml
new file mode 100644
index 00000000000..e74571406c3
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930008" version="0" comment="Version is less than 6.2.9200.23327">
+  <version datatype="version" operation="less than">6.2.9200.23327</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930012.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930012.xml
new file mode 100644
index 00000000000..172e76a75a0
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930012" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930015.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930015.xml
new file mode 100644
index 00000000000..cc5c0aed325
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930015" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930016.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930016.xml
new file mode 100644
index 00000000000..265ebf54ff4
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930016" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930017.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930017.xml
new file mode 100644
index 00000000000..d9e7b9cc785
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930017" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930028.xml b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930028.xml
new file mode 100644
index 00000000000..e92316044ea
--- /dev/null
+++ b/repository/states/windows/file_state/2021270930000/oval_com.jovalcm.ms.cve_ste_2021270930028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270930028" version="0" comment="Version is less than 6.0.6003.21095">
+  <version datatype="version" operation="less than">6.0.6003.21095</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940001.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940001.xml
new file mode 100644
index 00000000000..c71028c0bea
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940001" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940002.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940002.xml
new file mode 100644
index 00000000000..42fb39ea7a1
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940002" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940003.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940003.xml
new file mode 100644
index 00000000000..63519d87b7c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940003" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940004.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940004.xml
new file mode 100644
index 00000000000..7ddcf038598
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940004" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940005.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940005.xml
new file mode 100644
index 00000000000..c6dd4660acc
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940005" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940006.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940006.xml
new file mode 100644
index 00000000000..440ec18aaf0
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940006" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940007.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940007.xml
new file mode 100644
index 00000000000..718ff4ef8f7
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940007" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940008.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940008.xml
new file mode 100644
index 00000000000..5ba4a04e04b
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940008" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940009.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940009.xml
new file mode 100644
index 00000000000..a815afe1903
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940009" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940010.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940010.xml
new file mode 100644
index 00000000000..8fd0acc28f5
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940010" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940011.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940011.xml
new file mode 100644
index 00000000000..0e945a9a8c1
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940011" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940012.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940012.xml
new file mode 100644
index 00000000000..fd3c12e7a72
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940012" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940013.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940013.xml
new file mode 100644
index 00000000000..441d5902c96
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940013" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940014.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940014.xml
new file mode 100644
index 00000000000..93298e894e2
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940014" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940015.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940015.xml
new file mode 100644
index 00000000000..2619089c1c8
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940015" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940016.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940016.xml
new file mode 100644
index 00000000000..92ccd1b7980
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940016" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940017.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940017.xml
new file mode 100644
index 00000000000..f9fcf8b54bf
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940017" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940018.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940018.xml
new file mode 100644
index 00000000000..eb6b35cb7e3
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940018" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940019.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940019.xml
new file mode 100644
index 00000000000..e255407cb82
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940019" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940020.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940020.xml
new file mode 100644
index 00000000000..c4061fcae8d
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940020" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940021.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940021.xml
new file mode 100644
index 00000000000..f1e77cf1a2d
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940021" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940022.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940022.xml
new file mode 100644
index 00000000000..83f19f22489
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940022" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940023.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940023.xml
new file mode 100644
index 00000000000..82b3416eae7
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940023" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940024.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940024.xml
new file mode 100644
index 00000000000..7c0ada5bd83
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940024" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940025.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940025.xml
new file mode 100644
index 00000000000..32b8db65214
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940025.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940025" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940026.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940026.xml
new file mode 100644
index 00000000000..a645757bc40
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940026.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940026" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940027.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940027.xml
new file mode 100644
index 00000000000..5dba474819c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940027.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940027" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940028.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940028.xml
new file mode 100644
index 00000000000..880d0290ff4
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940028" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940029.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940029.xml
new file mode 100644
index 00000000000..2fecfae8cf6
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940029.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940029" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940030.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940030.xml
new file mode 100644
index 00000000000..e65c6525116
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940030.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940030" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940031.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940031.xml
new file mode 100644
index 00000000000..6b545b4b513
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940031.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940031" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940032.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940032.xml
new file mode 100644
index 00000000000..42bad445d86
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940032.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940032" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940033.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940033.xml
new file mode 100644
index 00000000000..8d3a1a4137a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940033.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940033" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940034.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940034.xml
new file mode 100644
index 00000000000..6b897b0ab4c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940034.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940034" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940035.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940035.xml
new file mode 100644
index 00000000000..371b551e804
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940035.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940035" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940036.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940036.xml
new file mode 100644
index 00000000000..e710e1d6461
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940036.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940036" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940037.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940037.xml
new file mode 100644
index 00000000000..06eba2812f6
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940037.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940037" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940038.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940038.xml
new file mode 100644
index 00000000000..97bc9958d02
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940038.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940038" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940039.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940039.xml
new file mode 100644
index 00000000000..c814566812e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940039.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940039" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940040.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940040.xml
new file mode 100644
index 00000000000..6e64bdf1520
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940040.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940040" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940041.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940041.xml
new file mode 100644
index 00000000000..3f26a846d0d
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940041.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940041" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940042.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940042.xml
new file mode 100644
index 00000000000..9732e120cae
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940042.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940042" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940043.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940043.xml
new file mode 100644
index 00000000000..b8b2c413666
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940043.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940043" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940044.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940044.xml
new file mode 100644
index 00000000000..1c0c36052a9
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940044.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940044" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940046.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940046.xml
new file mode 100644
index 00000000000..97bb07b063f
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940046.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940046" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940047.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940047.xml
new file mode 100644
index 00000000000..d2bb4bf6b1d
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940047.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940047" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940048.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940048.xml
new file mode 100644
index 00000000000..94d483a4db5
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940048.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940048" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940049.xml b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940049.xml
new file mode 100644
index 00000000000..b4054dbfde7
--- /dev/null
+++ b/repository/states/windows/file_state/2021270940000/oval_com.jovalcm.ms.cve_ste_2021270940049.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270940049" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950001.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950001.xml
new file mode 100644
index 00000000000..e97620acf3c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950001" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950002.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950002.xml
new file mode 100644
index 00000000000..ca467b6b02d
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950002" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950003.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950003.xml
new file mode 100644
index 00000000000..6cb5d0e0256
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950003" version="0" comment="Version is less than 6.3.9600.19988">
+  <version datatype="version" operation="less than">6.3.9600.19988</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950004.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950004.xml
new file mode 100644
index 00000000000..206410450e9
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950004" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950005.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950005.xml
new file mode 100644
index 00000000000..d3759c64125
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950005" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950006.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950006.xml
new file mode 100644
index 00000000000..f58aafa34fd
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950006" version="0" comment="Version is less than 6.3.9600.19988">
+  <version datatype="version" operation="less than">6.3.9600.19988</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950007.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950007.xml
new file mode 100644
index 00000000000..b00ed7fab60
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950007" version="0" comment="Version is less than 11">
+  <version datatype="version" operation="less than">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950008.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950008.xml
new file mode 100644
index 00000000000..3ce1ffbc9f5
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950008" version="0" comment="Version is greater than or equal to 12">
+  <version datatype="version" operation="greater than or equal">12</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950009.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950009.xml
new file mode 100644
index 00000000000..994702c09ae
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950009" version="0" comment="Version is less than 11.0.6003.21091">
+  <version datatype="version" operation="less than">11.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950010.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950010.xml
new file mode 100644
index 00000000000..ecd2d10531a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950010" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950011.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950011.xml
new file mode 100644
index 00000000000..b81df08ea0e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950011" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950012.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950012.xml
new file mode 100644
index 00000000000..e880ea83206
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950012" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950013.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950013.xml
new file mode 100644
index 00000000000..e957a65fc3d
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950013" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950014.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950014.xml
new file mode 100644
index 00000000000..f4dfb51897e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950014" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950015.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950015.xml
new file mode 100644
index 00000000000..2674bb7da18
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950015" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950016.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950016.xml
new file mode 100644
index 00000000000..d8676b9ab22
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950016" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950017.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950017.xml
new file mode 100644
index 00000000000..8c9e1e39b0e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950017" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950018.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950018.xml
new file mode 100644
index 00000000000..62b3a56b228
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950018" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950019.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950019.xml
new file mode 100644
index 00000000000..be012c866da
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950019" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950020.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950020.xml
new file mode 100644
index 00000000000..14b861944ca
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950020" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950021.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950021.xml
new file mode 100644
index 00000000000..8acddbd9678
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950021" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950022.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950022.xml
new file mode 100644
index 00000000000..66f4bf01023
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950022" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950023.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950023.xml
new file mode 100644
index 00000000000..ff6ee39e46a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950023" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950024.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950024.xml
new file mode 100644
index 00000000000..3d03301caaf
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950024" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950025.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950025.xml
new file mode 100644
index 00000000000..7d5891a4258
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950025.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950025" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950027.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950027.xml
new file mode 100644
index 00000000000..88c74dc8cd0
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950027.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950027" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950028.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950028.xml
new file mode 100644
index 00000000000..5ee000ea267
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950028" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950030.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950030.xml
new file mode 100644
index 00000000000..e32f2a09b8c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950030.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950030" version="0" comment="Version is less than 11">
+  <version datatype="version" operation="less than">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950031.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950031.xml
new file mode 100644
index 00000000000..5e7b366d3f7
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950031.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950031" version="0" comment="Version is greater than or equal to 12">
+  <version datatype="version" operation="greater than or equal">12</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950032.xml b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950032.xml
new file mode 100644
index 00000000000..234485a3021
--- /dev/null
+++ b/repository/states/windows/file_state/2021270950000/oval_com.jovalcm.ms.cve_ste_2021270950032.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270950032" version="0" comment="Version is less than 11.0.6003.21091">
+  <version datatype="version" operation="less than">11.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960009.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960009.xml
new file mode 100644
index 00000000000..8c089ff7726
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960009" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960012.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960012.xml
new file mode 100644
index 00000000000..50bd3818f87
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960012" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960013.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960013.xml
new file mode 100644
index 00000000000..be683224684
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960013" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960014.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960014.xml
new file mode 100644
index 00000000000..038862c990a
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960014" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960015.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960015.xml
new file mode 100644
index 00000000000..600e3903bba
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960015" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960016.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960016.xml
new file mode 100644
index 00000000000..0a800daee5e
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960016" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960017.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960017.xml
new file mode 100644
index 00000000000..32d123c54f5
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960017" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960018.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960018.xml
new file mode 100644
index 00000000000..d598d6b56e0
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960018" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960020.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960020.xml
new file mode 100644
index 00000000000..aca0e3e0d66
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960020" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960021.xml b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960021.xml
new file mode 100644
index 00000000000..19f9f3e9b3c
--- /dev/null
+++ b/repository/states/windows/file_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960021" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110001.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110001.xml
new file mode 100644
index 00000000000..e140d07b857
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110001" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110002.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110002.xml
new file mode 100644
index 00000000000..a522f2790f8
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110002" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110003.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110003.xml
new file mode 100644
index 00000000000..a8b8371dff8
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110003" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110004.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110004.xml
new file mode 100644
index 00000000000..974a2f94ed7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110004" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110005.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110005.xml
new file mode 100644
index 00000000000..87cdb132012
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110005" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110006.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110006.xml
new file mode 100644
index 00000000000..ff2c827cd33
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110006" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110007.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110007.xml
new file mode 100644
index 00000000000..80becfebe5a
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110007" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110008.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110008.xml
new file mode 100644
index 00000000000..4b6149d69c4
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110008" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110009.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110009.xml
new file mode 100644
index 00000000000..a298ce9940f
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110009" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110010.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110010.xml
new file mode 100644
index 00000000000..a77ff5cf9b5
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110010" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110011.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110011.xml
new file mode 100644
index 00000000000..5b0f8c39c1d
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110011" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110012.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110012.xml
new file mode 100644
index 00000000000..f0beb6f7f12
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110012" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110014.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110014.xml
new file mode 100644
index 00000000000..43be3968441
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110014" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110015.xml b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110015.xml
new file mode 100644
index 00000000000..d08ae3eff01
--- /dev/null
+++ b/repository/states/windows/file_state/2021283110000/oval_com.jovalcm.ms.cve_ste_2021283110015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283110015" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160003.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160003.xml
new file mode 100644
index 00000000000..ec70ec57c79
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160003" version="0" comment="Version is less than 6.3.9600.19987">
+  <version datatype="version" operation="less than">6.3.9600.19987</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160006.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160006.xml
new file mode 100644
index 00000000000..749b4a9c3f2
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160006" version="0" comment="Version is less than 6.3.9600.19987">
+  <version datatype="version" operation="less than">6.3.9600.19987</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160007.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160007.xml
new file mode 100644
index 00000000000..accbf83622d
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160007" version="0" comment="Version is less than 6.2.9200.23332">
+  <version datatype="version" operation="less than">6.2.9200.23332</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160008.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160008.xml
new file mode 100644
index 00000000000..80b1fc54713
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160008" version="0" comment="Version is less than 6.2.9200.23332">
+  <version datatype="version" operation="less than">6.2.9200.23332</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160011.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160011.xml
new file mode 100644
index 00000000000..2a026606788
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160011" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160014.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160014.xml
new file mode 100644
index 00000000000..8a890413c6b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160014" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160015.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160015.xml
new file mode 100644
index 00000000000..93d29826939
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160015" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160016.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160016.xml
new file mode 100644
index 00000000000..c5c5414e128
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160016" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160017.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160017.xml
new file mode 100644
index 00000000000..f7bf0560c07
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160017" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160018.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160018.xml
new file mode 100644
index 00000000000..67cd9db7861
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160018" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160019.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160019.xml
new file mode 100644
index 00000000000..382773fb9a3
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160019" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160020.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160020.xml
new file mode 100644
index 00000000000..3bae8ae9fef
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160020" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160021.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160021.xml
new file mode 100644
index 00000000000..bc6404eb7ae
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160021" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160022.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160022.xml
new file mode 100644
index 00000000000..16404fc4902
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160022" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160024.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160024.xml
new file mode 100644
index 00000000000..a5f5480e382
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160024" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160025.xml b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160025.xml
new file mode 100644
index 00000000000..3c68840e594
--- /dev/null
+++ b/repository/states/windows/file_state/2021283160000/oval_com.jovalcm.ms.cve_ste_2021283160025.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283160025" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170003.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170003.xml
new file mode 100644
index 00000000000..c0c60f59562
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170003" version="0" comment="Version is less than 6.3.9600.19988">
+  <version datatype="version" operation="less than">6.3.9600.19988</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170006.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170006.xml
new file mode 100644
index 00000000000..1d09e559f5e
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170006" version="0" comment="Version is less than 6.3.9600.19988">
+  <version datatype="version" operation="less than">6.3.9600.19988</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170009.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170009.xml
new file mode 100644
index 00000000000..61b3665bbb7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170009" version="0" comment="Version is less than 7.0.6003.21090">
+  <version datatype="version" operation="less than">7.0.6003.21090</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170010.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170010.xml
new file mode 100644
index 00000000000..34517d26444
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170010" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170011.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170011.xml
new file mode 100644
index 00000000000..9e126c26352
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170011" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170014.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170014.xml
new file mode 100644
index 00000000000..3d3fe6a4fae
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170014" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170017.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170017.xml
new file mode 100644
index 00000000000..cd531f200b1
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170017" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170018.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170018.xml
new file mode 100644
index 00000000000..10703917421
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170018" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170019.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170019.xml
new file mode 100644
index 00000000000..6a7a7518669
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170019" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170020.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170020.xml
new file mode 100644
index 00000000000..b5e53bb1a96
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170020" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170021.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170021.xml
new file mode 100644
index 00000000000..69a59612092
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170021" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170022.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170022.xml
new file mode 100644
index 00000000000..0f22f3f6c21
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170022" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170023.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170023.xml
new file mode 100644
index 00000000000..cda75750be7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170023" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170024.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170024.xml
new file mode 100644
index 00000000000..7142f060974
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170024" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170025.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170025.xml
new file mode 100644
index 00000000000..7c0d173c9d9
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170025.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170025" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170027.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170027.xml
new file mode 100644
index 00000000000..0f80603909b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170027.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170027" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170028.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170028.xml
new file mode 100644
index 00000000000..d90cb5cd652
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170028" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170032.xml b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170032.xml
new file mode 100644
index 00000000000..b9eb6233482
--- /dev/null
+++ b/repository/states/windows/file_state/2021283170000/oval_com.jovalcm.ms.cve_ste_2021283170032.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283170032" version="0" comment="Version is less than 7.0.6003.21090">
+  <version datatype="version" operation="less than">7.0.6003.21090</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180003.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180003.xml
new file mode 100644
index 00000000000..7e1f0915cfc
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180003" version="0" comment="Version is less than 6.3.9600.19987">
+  <version datatype="version" operation="less than">6.3.9600.19987</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180006.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180006.xml
new file mode 100644
index 00000000000..660ea9f84ff
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180006" version="0" comment="Version is less than 5.2.6003.21091">
+  <version datatype="version" operation="less than">5.2.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180007.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180007.xml
new file mode 100644
index 00000000000..ac31e05f7c0
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180007" version="0" comment="Version is less than 6.0.6003.21091">
+  <version datatype="version" operation="less than">6.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180010.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180010.xml
new file mode 100644
index 00000000000..6cad0c3d966
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180010" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180013.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180013.xml
new file mode 100644
index 00000000000..a1672e5fa19
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180013" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180016.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180016.xml
new file mode 100644
index 00000000000..8f1e99e0cc1
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180016" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180017.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180017.xml
new file mode 100644
index 00000000000..533dc21b8c3
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180017" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180018.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180018.xml
new file mode 100644
index 00000000000..d8925767764
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180018" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180019.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180019.xml
new file mode 100644
index 00000000000..c159d40d1b5
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180019" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180020.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180020.xml
new file mode 100644
index 00000000000..8307b944ecc
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180020" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180022.xml b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180022.xml
new file mode 100644
index 00000000000..630d39439ea
--- /dev/null
+++ b/repository/states/windows/file_state/2021283180000/oval_com.jovalcm.ms.cve_ste_2021283180022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283180022" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190003.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190003.xml
new file mode 100644
index 00000000000..71ebfa2b510
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190003" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190006.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190006.xml
new file mode 100644
index 00000000000..7795eddcbb4
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190006" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190007.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190007.xml
new file mode 100644
index 00000000000..12feb2019f6
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190007" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190008.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190008.xml
new file mode 100644
index 00000000000..395efdafa8a
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190008" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190009.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190009.xml
new file mode 100644
index 00000000000..7ce81ffb9c7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190009" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190010.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190010.xml
new file mode 100644
index 00000000000..7f37fa12746
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190010" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190012.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190012.xml
new file mode 100644
index 00000000000..ca3ff4f6aa2
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190012" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190013.xml b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190013.xml
new file mode 100644
index 00000000000..7172d1d909b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283190000/oval_com.jovalcm.ms.cve_ste_2021283190013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283190013" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200001.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200001.xml
new file mode 100644
index 00000000000..9dbd8f309c0
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200001" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200002.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200002.xml
new file mode 100644
index 00000000000..d7cec385d85
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200002" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200003.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200003.xml
new file mode 100644
index 00000000000..e8a420df986
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200003" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200004.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200004.xml
new file mode 100644
index 00000000000..4969456061b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200004" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200005.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200005.xml
new file mode 100644
index 00000000000..e0e16f6b943
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200005" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200006.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200006.xml
new file mode 100644
index 00000000000..97592337118
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200006" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200007.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200007.xml
new file mode 100644
index 00000000000..4bf0ad9acbd
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200007" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200008.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200008.xml
new file mode 100644
index 00000000000..2528faeeb28
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200008" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200009.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200009.xml
new file mode 100644
index 00000000000..ca1c06e58c4
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200009" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200010.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200010.xml
new file mode 100644
index 00000000000..95aeb133b3b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200010" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200011.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200011.xml
new file mode 100644
index 00000000000..303659d602c
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200011" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200012.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200012.xml
new file mode 100644
index 00000000000..cd9c6c02e71
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200012" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200013.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200013.xml
new file mode 100644
index 00000000000..38057f85809
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200013" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200014.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200014.xml
new file mode 100644
index 00000000000..8084039a9f2
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200014" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200016.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200016.xml
new file mode 100644
index 00000000000..eedb64bf713
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200016" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200017.xml b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200017.xml
new file mode 100644
index 00000000000..988fc1e4a33
--- /dev/null
+++ b/repository/states/windows/file_state/2021283200000/oval_com.jovalcm.ms.cve_ste_2021283200017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283200017" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230003.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230003.xml
new file mode 100644
index 00000000000..f36dba74593
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230003" version="0" comment="Version is less than 6.3.9600.19990">
+  <version datatype="version" operation="less than">6.3.9600.19990</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230006.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230006.xml
new file mode 100644
index 00000000000..cdfb12b31f3
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230006" version="0" comment="Version is less than 6.3.9600.19990">
+  <version datatype="version" operation="less than">6.3.9600.19990</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230007.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230007.xml
new file mode 100644
index 00000000000..8f9469ab9b9
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230007" version="0" comment="Version is less than 6.0.6003.21094">
+  <version datatype="version" operation="less than">6.0.6003.21094</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230010.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230010.xml
new file mode 100644
index 00000000000..d3498aa19f3
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230010" version="0" comment="Version is less than 6.0.6003.21094">
+  <version datatype="version" operation="less than">6.0.6003.21094</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230013.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230013.xml
new file mode 100644
index 00000000000..6617d33ee5e
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230013" version="0" comment="Version is less than 6.0.6003.21094">
+  <version datatype="version" operation="less than">6.0.6003.21094</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230014.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230014.xml
new file mode 100644
index 00000000000..43b9a7b5c37
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230014" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230015.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230015.xml
new file mode 100644
index 00000000000..02f9dd9c800
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230015" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230018.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230018.xml
new file mode 100644
index 00000000000..e549195e775
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230018" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230021.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230021.xml
new file mode 100644
index 00000000000..4ceb8fa4d56
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230021" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230024.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230024.xml
new file mode 100644
index 00000000000..97057dad8d8
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230024" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230027.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230027.xml
new file mode 100644
index 00000000000..37601c98a1d
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230027.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230027" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230028.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230028.xml
new file mode 100644
index 00000000000..4582099b2ec
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230028" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230029.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230029.xml
new file mode 100644
index 00000000000..c282c45f923
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230029.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230029" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230030.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230030.xml
new file mode 100644
index 00000000000..97eaa4ba312
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230030.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230030" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230031.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230031.xml
new file mode 100644
index 00000000000..1c7f6064346
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230031.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230031" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230032.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230032.xml
new file mode 100644
index 00000000000..3b2bb3dffc5
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230032.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230032" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230033.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230033.xml
new file mode 100644
index 00000000000..4ec53f3295a
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230033.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230033" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230034.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230034.xml
new file mode 100644
index 00000000000..2cef1232ba0
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230034.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230034" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230035.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230035.xml
new file mode 100644
index 00000000000..ef788f92b16
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230035.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230035" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230036.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230036.xml
new file mode 100644
index 00000000000..6307867396a
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230036.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230036" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230037.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230037.xml
new file mode 100644
index 00000000000..fb56beaed3e
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230037.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230037" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230038.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230038.xml
new file mode 100644
index 00000000000..6a1bf13a5f5
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230038.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230038" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230039.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230039.xml
new file mode 100644
index 00000000000..1cf1942479c
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230039.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230039" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230040.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230040.xml
new file mode 100644
index 00000000000..cfcae037c75
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230040.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230040" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230041.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230041.xml
new file mode 100644
index 00000000000..87d75142dde
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230041.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230041" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230042.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230042.xml
new file mode 100644
index 00000000000..36d3e44d066
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230042.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230042" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230043.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230043.xml
new file mode 100644
index 00000000000..0e6885f41a9
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230043.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230043" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230045.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230045.xml
new file mode 100644
index 00000000000..6d2d5a20ec8
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230045.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230045" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230046.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230046.xml
new file mode 100644
index 00000000000..f47c8e7d04b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230046.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230046" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230047.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230047.xml
new file mode 100644
index 00000000000..95facf51418
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230047.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230047" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230048.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230048.xml
new file mode 100644
index 00000000000..e3fa4db0008
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230048.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230048" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230050.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230050.xml
new file mode 100644
index 00000000000..3fb52c9b681
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230050.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230050" version="0" comment="Version is less than 6.0.6003.21094">
+  <version datatype="version" operation="less than">6.0.6003.21094</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230053.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230053.xml
new file mode 100644
index 00000000000..4c80921b653
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230053.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230053" version="0" comment="Version is less than 6.0.6003.21094">
+  <version datatype="version" operation="less than">6.0.6003.21094</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230056.xml b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230056.xml
new file mode 100644
index 00000000000..943b625cb46
--- /dev/null
+++ b/repository/states/windows/file_state/2021283230000/oval_com.jovalcm.ms.cve_ste_2021283230056.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283230056" version="0" comment="Version is less than 6.0.6003.21094">
+  <version datatype="version" operation="less than">6.0.6003.21094</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240004.xml b/repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240004.xml
new file mode 100644
index 00000000000..5ca8cf77940
--- /dev/null
+++ b/repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283240004" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240007.xml b/repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240007.xml
new file mode 100644
index 00000000000..60d5afc3b0d
--- /dev/null
+++ b/repository/states/windows/file_state/2021283240000/oval_com.jovalcm.ms.cve_ste_2021283240007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283240007" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250003.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250003.xml
new file mode 100644
index 00000000000..3d10ba0641c
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250003" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250006.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250006.xml
new file mode 100644
index 00000000000..2b3b90835c3
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250006" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250007.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250007.xml
new file mode 100644
index 00000000000..69ab05c1dd5
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250007" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250008.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250008.xml
new file mode 100644
index 00000000000..484951734b2
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250008" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250011.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250011.xml
new file mode 100644
index 00000000000..e3cbf42db7e
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250011" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250014.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250014.xml
new file mode 100644
index 00000000000..958e7bde713
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250014" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250015.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250015.xml
new file mode 100644
index 00000000000..d36a7df275e
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250015" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250016.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250016.xml
new file mode 100644
index 00000000000..fe4b7c3e526
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250016" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250017.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250017.xml
new file mode 100644
index 00000000000..e0a9f1d0135
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250017" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250018.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250018.xml
new file mode 100644
index 00000000000..f62c6330188
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250018" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250019.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250019.xml
new file mode 100644
index 00000000000..529b4e19e3b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250019" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250020.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250020.xml
new file mode 100644
index 00000000000..a2dcb691a30
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250020" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250021.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250021.xml
new file mode 100644
index 00000000000..727ee2f59f1
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250021" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250022.xml b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250022.xml
new file mode 100644
index 00000000000..99c4e4b36e8
--- /dev/null
+++ b/repository/states/windows/file_state/2021283250000/oval_com.jovalcm.ms.cve_ste_2021283250022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283250022" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260003.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260003.xml
new file mode 100644
index 00000000000..3f4293b5e9c
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260003" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260006.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260006.xml
new file mode 100644
index 00000000000..d4fe7386570
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260006" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260007.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260007.xml
new file mode 100644
index 00000000000..6d5af507c7a
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260007" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260008.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260008.xml
new file mode 100644
index 00000000000..a200b15c5a7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260008" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260009.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260009.xml
new file mode 100644
index 00000000000..e245083fff7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260009" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260010.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260010.xml
new file mode 100644
index 00000000000..d53cedd7200
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260010" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260011.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260011.xml
new file mode 100644
index 00000000000..cc75e7a01e6
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260011" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260012.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260012.xml
new file mode 100644
index 00000000000..098459cdb43
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260012" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260013.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260013.xml
new file mode 100644
index 00000000000..c46da19755f
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260013" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260014.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260014.xml
new file mode 100644
index 00000000000..b8942aae975
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260014" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260016.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260016.xml
new file mode 100644
index 00000000000..75f621d36e8
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260016" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260017.xml b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260017.xml
new file mode 100644
index 00000000000..3c79729b285
--- /dev/null
+++ b/repository/states/windows/file_state/2021283260000/oval_com.jovalcm.ms.cve_ste_2021283260017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283260017" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270003.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270003.xml
new file mode 100644
index 00000000000..37d77972697
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270003" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270006.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270006.xml
new file mode 100644
index 00000000000..fa18ee860d0
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270006" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270007.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270007.xml
new file mode 100644
index 00000000000..950165a4685
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270007" version="0" comment="Version is less than 6.0.6003.21095">
+  <version datatype="version" operation="less than">6.0.6003.21095</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270008.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270008.xml
new file mode 100644
index 00000000000..1b96bc247b3
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270008" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270009.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270009.xml
new file mode 100644
index 00000000000..b8126e5f650
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270009" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270012.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270012.xml
new file mode 100644
index 00000000000..3d1df7fd2e8
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270012" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270015.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270015.xml
new file mode 100644
index 00000000000..24e93e0866d
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270015" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270016.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270016.xml
new file mode 100644
index 00000000000..2d4ee56aa21
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270016" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270017.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270017.xml
new file mode 100644
index 00000000000..488684d4535
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270017" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270018.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270018.xml
new file mode 100644
index 00000000000..fa0f0b69607
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270018" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270019.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270019.xml
new file mode 100644
index 00000000000..f9b474d56e7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270019" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270020.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270020.xml
new file mode 100644
index 00000000000..97215592445
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270020" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270021.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270021.xml
new file mode 100644
index 00000000000..c0d71ae4a02
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270021" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270022.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270022.xml
new file mode 100644
index 00000000000..ad8d9bb7037
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270022" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270023.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270023.xml
new file mode 100644
index 00000000000..5dbcac1ecf7
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270023" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270025.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270025.xml
new file mode 100644
index 00000000000..c676de6a9b6
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270025.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270025" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270026.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270026.xml
new file mode 100644
index 00000000000..5482a0def1c
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270026.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270026" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270028.xml b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270028.xml
new file mode 100644
index 00000000000..c152330ca1b
--- /dev/null
+++ b/repository/states/windows/file_state/2021283270000/oval_com.jovalcm.ms.cve_ste_2021283270028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283270028" version="0" comment="Version is less than 6.0.6003.21095">
+  <version datatype="version" operation="less than">6.0.6003.21095</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380003.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380003.xml
new file mode 100644
index 00000000000..0c437ade7fd
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380003" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380006.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380006.xml
new file mode 100644
index 00000000000..c66457128d6
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380006" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380007.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380007.xml
new file mode 100644
index 00000000000..14e4960d215
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380007" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380008.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380008.xml
new file mode 100644
index 00000000000..83daf751cb4
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380008" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380009.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380009.xml
new file mode 100644
index 00000000000..dc7298bc8e2
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380009" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380010.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380010.xml
new file mode 100644
index 00000000000..2c6b1b65347
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380010" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380012.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380012.xml
new file mode 100644
index 00000000000..604624ef6d5
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380012" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380013.xml b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380013.xml
new file mode 100644
index 00000000000..965f1403b7a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284380000/oval_com.jovalcm.ms.cve_ste_2021284380013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284380013" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390003.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390003.xml
new file mode 100644
index 00000000000..1a9c7d417c0
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390003" version="0" comment="Version is less than 6.3.9600.19984">
+  <version datatype="version" operation="less than">6.3.9600.19984</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390006.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390006.xml
new file mode 100644
index 00000000000..74e2254e809
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390006" version="0" comment="Version is less than 6.3.9600.19984">
+  <version datatype="version" operation="less than">6.3.9600.19984</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390007.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390007.xml
new file mode 100644
index 00000000000..87d1bdd326a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390007" version="0" comment="Version is less than 6.0.6003.21088">
+  <version datatype="version" operation="less than">6.0.6003.21088</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390008.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390008.xml
new file mode 100644
index 00000000000..e22c43dad82
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390008" version="0" comment="Version is less than 6.2.9200.23320">
+  <version datatype="version" operation="less than">6.2.9200.23320</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390009.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390009.xml
new file mode 100644
index 00000000000..557d8c8ec68
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390009" version="0" comment="Version is less than 6.2.9200.23320">
+  <version datatype="version" operation="less than">6.2.9200.23320</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390012.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390012.xml
new file mode 100644
index 00000000000..f6a113d6951
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390012" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390015.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390015.xml
new file mode 100644
index 00000000000..1074069e93b
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390015" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390016.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390016.xml
new file mode 100644
index 00000000000..1e565902996
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390016" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390017.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390017.xml
new file mode 100644
index 00000000000..543c8b9eab3
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390017" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390028.xml b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390028.xml
new file mode 100644
index 00000000000..b21cb75872d
--- /dev/null
+++ b/repository/states/windows/file_state/2021284390000/oval_com.jovalcm.ms.cve_ste_2021284390028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284390028" version="0" comment="Version is less than 6.0.6003.21088">
+  <version datatype="version" operation="less than">6.0.6003.21088</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440003.xml b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440003.xml
new file mode 100644
index 00000000000..8eb6d47fb01
--- /dev/null
+++ b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284440003" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440006.xml b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440006.xml
new file mode 100644
index 00000000000..ed70cf67fb0
--- /dev/null
+++ b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284440006" version="0" comment="Version is less than 6.3.9600.19994">
+  <version datatype="version" operation="less than">6.3.9600.19994</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440009.xml b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440009.xml
new file mode 100644
index 00000000000..84532a9aaba
--- /dev/null
+++ b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284440009" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440012.xml b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440012.xml
new file mode 100644
index 00000000000..4007bab3f0a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284440012" version="0" comment="Version is less than 10.0.10240.18906">
+  <version datatype="version" operation="less than">10.0.10240.18906</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440015.xml b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440015.xml
new file mode 100644
index 00000000000..77e7c91f739
--- /dev/null
+++ b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284440015" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440016.xml b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440016.xml
new file mode 100644
index 00000000000..c3ac530be00
--- /dev/null
+++ b/repository/states/windows/file_state/2021284440000/oval_com.jovalcm.ms.cve_ste_2021284440016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284440016" version="0" comment="Version is less than 10.0.17134.2145">
+  <version datatype="version" operation="less than">10.0.17134.2145</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450003.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450003.xml
new file mode 100644
index 00000000000..8cfd61f9ede
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450003" version="0" comment="Version is less than 6.3.9600.19988">
+  <version datatype="version" operation="less than">6.3.9600.19988</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450006.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450006.xml
new file mode 100644
index 00000000000..f071e9eb45b
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450006" version="0" comment="Version is less than 6.3.9600.19988">
+  <version datatype="version" operation="less than">6.3.9600.19988</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450009.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450009.xml
new file mode 100644
index 00000000000..40f98237e6d
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450009" version="0" comment="Version is less than 6.0.6003.21091">
+  <version datatype="version" operation="less than">6.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450010.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450010.xml
new file mode 100644
index 00000000000..6c2681f3f8c
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450010" version="0" comment="Version is less than 6.0.6003.21091">
+  <version datatype="version" operation="less than">6.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450011.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450011.xml
new file mode 100644
index 00000000000..92d64bb208a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450011" version="0" comment="Version is less than 6.2.9200.23326">
+  <version datatype="version" operation="less than">6.2.9200.23326</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450012.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450012.xml
new file mode 100644
index 00000000000..5205bf579bf
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450012" version="0" comment="Version is less than 6.2.9200.23326">
+  <version datatype="version" operation="less than">6.2.9200.23326</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450015.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450015.xml
new file mode 100644
index 00000000000..1a683d270e7
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450015" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450018.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450018.xml
new file mode 100644
index 00000000000..61c552840be
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450018" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450019.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450019.xml
new file mode 100644
index 00000000000..78c8e936acb
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450019" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450020.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450020.xml
new file mode 100644
index 00000000000..8ab2d5bd76a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450020.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450020" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450021.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450021.xml
new file mode 100644
index 00000000000..8207dbbc777
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450021" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450022.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450022.xml
new file mode 100644
index 00000000000..1b05a6a4c7f
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450022" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450023.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450023.xml
new file mode 100644
index 00000000000..81695cf3c85
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450023.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450023" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450024.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450024.xml
new file mode 100644
index 00000000000..b447a79f74b
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450024" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450025.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450025.xml
new file mode 100644
index 00000000000..ff87023bf0c
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450025.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450025" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450026.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450026.xml
new file mode 100644
index 00000000000..cc8f6467a96
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450026.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450026" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450027.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450027.xml
new file mode 100644
index 00000000000..406c4d8cf37
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450027.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450027" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450028.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450028.xml
new file mode 100644
index 00000000000..4a4a13aff84
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450028.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450028" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450030.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450030.xml
new file mode 100644
index 00000000000..a5b4bd07879
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450030.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450030" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450031.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450031.xml
new file mode 100644
index 00000000000..409a76b492c
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450031.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450031" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450032.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450032.xml
new file mode 100644
index 00000000000..7ee909eebd0
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450032.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450032" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450033.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450033.xml
new file mode 100644
index 00000000000..a8c702bb081
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450033.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450033" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450037.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450037.xml
new file mode 100644
index 00000000000..d1b79eb9e28
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450037.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450037" version="0" comment="Version is less than 6.0.6003.21091">
+  <version datatype="version" operation="less than">6.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450038.xml b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450038.xml
new file mode 100644
index 00000000000..33e02410b9a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284450000/oval_com.jovalcm.ms.cve_ste_2021284450038.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284450038" version="0" comment="Version is less than 6.0.6003.21091">
+  <version datatype="version" operation="less than">6.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460001.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460001.xml
new file mode 100644
index 00000000000..26715dbe857
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460001.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460001" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460002.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460002.xml
new file mode 100644
index 00000000000..99524442c5a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460002.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460002" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460003.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460003.xml
new file mode 100644
index 00000000000..0ad7b2830a1
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460003.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460003" version="0" comment="Version is less than 6.3.9600.19987">
+  <version datatype="version" operation="less than">6.3.9600.19987</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460004.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460004.xml
new file mode 100644
index 00000000000..77acdc6c210
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460004.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460004" version="0" comment="Version is less than 6">
+  <version datatype="version" operation="less than">6</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460005.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460005.xml
new file mode 100644
index 00000000000..6719928f0a8
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460005.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460005" version="0" comment="Version is greater than or equal to 7">
+  <version datatype="version" operation="greater than or equal">7</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460006.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460006.xml
new file mode 100644
index 00000000000..a54825e5ebb
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460006.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460006" version="0" comment="Version is less than 6.3.9600.19987">
+  <version datatype="version" operation="less than">6.3.9600.19987</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460007.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460007.xml
new file mode 100644
index 00000000000..3448d864aea
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460007.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460007" version="0" comment="Version is less than 6.0.6003.21091">
+  <version datatype="version" operation="less than">6.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460008.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460008.xml
new file mode 100644
index 00000000000..531ccbf2b63
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460008.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460008" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460009.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460009.xml
new file mode 100644
index 00000000000..822ecbb2ab6
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460009.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460009" version="0" comment="Version is less than 6.2.9200.23324">
+  <version datatype="version" operation="less than">6.2.9200.23324</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460010.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460010.xml
new file mode 100644
index 00000000000..82e6effd4c5
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460010.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460010" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460011.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460011.xml
new file mode 100644
index 00000000000..e79bae974b6
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460011.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460011" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460012.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460012.xml
new file mode 100644
index 00000000000..431e1b02bdd
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460012.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460012" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460013.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460013.xml
new file mode 100644
index 00000000000..e6acb722304
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460013.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460013" version="0" comment="Version is less than 10">
+  <version datatype="version" operation="less than">10</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460014.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460014.xml
new file mode 100644
index 00000000000..fec1207e9ec
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460014.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460014" version="0" comment="Version is greater than or equal to 11">
+  <version datatype="version" operation="greater than or equal">11</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460015.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460015.xml
new file mode 100644
index 00000000000..9ff00f27924
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460015.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460015" version="0" comment="Version is less than 10.0.14393.4350">
+  <version datatype="version" operation="less than">10.0.14393.4350</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460016.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460016.xml
new file mode 100644
index 00000000000..b7cb04d2833
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460016.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460016" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460017.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460017.xml
new file mode 100644
index 00000000000..3febc6c1dab
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460017.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460017" version="0" comment="Version is less than 10.0.17763.1879">
+  <version datatype="version" operation="less than">10.0.17763.1879</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460018.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460018.xml
new file mode 100644
index 00000000000..e93573b32aa
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460018.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460018" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460019.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460019.xml
new file mode 100644
index 00000000000..d1ee3afb51a
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460019.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460019" version="0" comment="Version is less than 10.0.18362.1500">
+  <version datatype="version" operation="less than">10.0.18362.1500</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460021.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460021.xml
new file mode 100644
index 00000000000..6ee1e84aea6
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460021.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460021" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460022.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460022.xml
new file mode 100644
index 00000000000..e212aa98b07
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460022.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460022" version="0" comment="Version is less than 10.0.19041.928">
+  <version datatype="version" operation="less than">10.0.19041.928</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460024.xml b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460024.xml
new file mode 100644
index 00000000000..f7a83e26c01
--- /dev/null
+++ b/repository/states/windows/file_state/2021284460000/oval_com.jovalcm.ms.cve_ste_2021284460024.xml
@@ -0,0 +1,3 @@
+<file_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021284460024" version="0" comment="Version is less than 6.0.6003.21091">
+  <version datatype="version" operation="less than">6.0.6003.21091</version>
+</file_state>
\ No newline at end of file
diff --git a/repository/states/windows/registry_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960006.xml b/repository/states/windows/registry_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960006.xml
new file mode 100644
index 00000000000..58230302790
--- /dev/null
+++ b/repository/states/windows/registry_state/2021270960000/oval_com.jovalcm.ms.cve_ste_2021270960006.xml
@@ -0,0 +1,3 @@
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021270960006" version="0" comment="Windows revision number is less than 18906">
+  <value operation="less than" datatype="int">18906</value>
+</registry_state>
\ No newline at end of file
diff --git a/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470004.xml b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470004.xml
new file mode 100644
index 00000000000..b8ffdb9e073
--- /dev/null
+++ b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470004.xml
@@ -0,0 +1,3 @@
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283470004" version="0" comment="Windows revision number is less than 4350">
+  <value operation="less than" datatype="int">4350</value>
+</registry_state>
\ No newline at end of file
diff --git a/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470006.xml b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470006.xml
new file mode 100644
index 00000000000..1587a9bc467
--- /dev/null
+++ b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470006.xml
@@ -0,0 +1,3 @@
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283470006" version="0" comment="Windows revision number is less than 2145">
+  <value operation="less than" datatype="int">2145</value>
+</registry_state>
\ No newline at end of file
diff --git a/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470008.xml b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470008.xml
new file mode 100644
index 00000000000..8316c341aac
--- /dev/null
+++ b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470008.xml
@@ -0,0 +1,3 @@
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283470008" version="0" comment="Windows revision number is less than 1879">
+  <value operation="less than" datatype="int">1879</value>
+</registry_state>
\ No newline at end of file
diff --git a/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470010.xml b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470010.xml
new file mode 100644
index 00000000000..ed781d9db56
--- /dev/null
+++ b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470010.xml
@@ -0,0 +1,3 @@
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283470010" version="0" comment="Windows revision number is less than 1500">
+  <value operation="less than" datatype="int">1500</value>
+</registry_state>
\ No newline at end of file
diff --git a/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470013.xml b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470013.xml
new file mode 100644
index 00000000000..62ba8fbbd43
--- /dev/null
+++ b/repository/states/windows/registry_state/2021283470000/oval_com.jovalcm.ms.cve_ste_2021283470013.xml
@@ -0,0 +1,3 @@
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:ste:2021283470013" version="0" comment="Windows revision number is less than 928">
+  <value operation="less than" datatype="int">928</value>
+</registry_state>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130001.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130001.xml
new file mode 100644
index 00000000000..b346fea877f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130001" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130002.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130002.xml
new file mode 100644
index 00000000000..a81961bb8e2
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130002" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130003.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130003.xml
new file mode 100644
index 00000000000..0677f45197d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130003" version="0" check="at least one" comment="msi.dll (4.x) version is less than 4.5.6003.21095">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130004.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130004.xml
new file mode 100644
index 00000000000..207fc23c652
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130004" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.9200.23327">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130005.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130005.xml
new file mode 100644
index 00000000000..85c92b5dfcc
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130005" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.9200.23327">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130006.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130006.xml
new file mode 100644
index 00000000000..30fcd50b62c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130006" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130007.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130007.xml
new file mode 100644
index 00000000000..ad126cd059f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130007" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130008.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130008.xml
new file mode 100644
index 00000000000..a5196a8b6ab
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130008" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130009.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130009.xml
new file mode 100644
index 00000000000..fdfd6079752
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130009" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130010.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130010.xml
new file mode 100644
index 00000000000..d6dbafc90be
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130010" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130011.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130011.xml
new file mode 100644
index 00000000000..449c34ea572
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130011" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130012.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130012.xml
new file mode 100644
index 00000000000..2212834dfa8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130012" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130013.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130013.xml
new file mode 100644
index 00000000000..c30639398ad
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130013" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130014.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130014.xml
new file mode 100644
index 00000000000..b778e771c7a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130014" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130015.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130015.xml
new file mode 100644
index 00000000000..754cd4d1284
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130015" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130017.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130017.xml
new file mode 100644
index 00000000000..66e4dfb0deb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130017" version="0" check="at least one" comment="msi.dll (5.x) version is less than 5.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130023"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130018.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130018.xml
new file mode 100644
index 00000000000..cfaa48935dd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130018.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130018" version="0" check="at least one" comment="msi.dll (32-bit) (5.x) version is less than 5.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130020.xml b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130020.xml
new file mode 100644
index 00000000000..c45113e60c5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264130000/oval_com.jovalcm.ms.cve_tst_2021264130020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264130020" version="0" check="at least one" comment="msi.dll (32-bit) (4.x) version is less than 4.5.6003.21095">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264130008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264130028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160001.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160001.xml
new file mode 100644
index 00000000000..a520c615c10
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160001" version="0" check="at least one" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160002.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160002.xml
new file mode 100644
index 00000000000..9192f0237ec
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160002" version="0" check="at least one" comment="hvax64.exe (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160003.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160003.xml
new file mode 100644
index 00000000000..b833e386afd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160003" version="0" check="at least one" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160004.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160004.xml
new file mode 100644
index 00000000000..5d766108936
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160004" version="0" check="at least one" comment="hvax64.exe (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160005.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160005.xml
new file mode 100644
index 00000000000..206363e321a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160005" version="0" check="at least one" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160006.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160006.xml
new file mode 100644
index 00000000000..d66d2ef340e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160006" version="0" check="at least one" comment="hvax64.exe (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160008.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160008.xml
new file mode 100644
index 00000000000..d4be0b8a847
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160008" version="0" check="at least one" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160009.xml b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160009.xml
new file mode 100644
index 00000000000..beacdbcde5e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264160000/oval_com.jovalcm.ms.cve_tst_2021264160009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264160009" version="0" check="at least one" comment="hvax64.exe (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264160013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170001.xml b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170001.xml
new file mode 100644
index 00000000000..3dd9d7c1e0f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264170001" version="0" check="at least one" comment="wof.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264170003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264170003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170002.xml b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170002.xml
new file mode 100644
index 00000000000..098f1ec5f71
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264170002" version="0" check="at least one" comment="wof.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264170005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264170006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170003.xml b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170003.xml
new file mode 100644
index 00000000000..22af97c2ce9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264170003" version="0" check="at least one" comment="wof.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264170003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264170007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170004.xml b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170004.xml
new file mode 100644
index 00000000000..c1d41033d11
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264170004" version="0" check="at least one" comment="wof.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264170005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264170008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170006.xml b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170006.xml
new file mode 100644
index 00000000000..bb630d3f7f1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264170006" version="0" check="at least one" comment="wof.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264170003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264170010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170007.xml b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170007.xml
new file mode 100644
index 00000000000..e7d85f3a734
--- /dev/null
+++ b/repository/tests/windows/file_test/2021264170000/oval_com.jovalcm.ms.cve_tst_2021264170007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021264170007" version="0" check="at least one" comment="wof.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264170005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021264170011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720001.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720001.xml
new file mode 100644
index 00000000000..8259abbb66d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720001" version="0" check="at least one" comment="win32k.sys (32-bit) (6.x) version is less than 6.2.9200.23337">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720002.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720002.xml
new file mode 100644
index 00000000000..725861cd98e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720002" version="0" check="at least one" comment="win32k.sys (6.x) version is less than 6.2.9200.23337">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720003.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720003.xml
new file mode 100644
index 00000000000..0d34eed5825
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720003" version="0" check="at least one" comment="win32k.sys (6.x) version is less than 6.3.9600.19990">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720004.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720004.xml
new file mode 100644
index 00000000000..1cd921e2ecb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720004" version="0" check="at least one" comment="win32k.sys (32-bit) (6.x) version is less than 6.3.9600.19990">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720005.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720005.xml
new file mode 100644
index 00000000000..ac42fce01d2
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720005" version="0" check="at least one" comment="win32kfull.sys (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720006.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720006.xml
new file mode 100644
index 00000000000..0611e79a076
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720006" version="0" check="at least one" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720007.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720007.xml
new file mode 100644
index 00000000000..15a0eaa89a1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720007" version="0" check="at least one" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.14393.4283">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720008.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720008.xml
new file mode 100644
index 00000000000..6b0beec47f1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720008" version="0" check="at least one" comment="win32kfull.sys (10.x) version is less than 10.0.14393.4283">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720009.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720009.xml
new file mode 100644
index 00000000000..12fa3fb7166
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720009" version="0" check="at least one" comment="win32kfull.sys (10.x) version is less than 10.0.17134.2087">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720010.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720010.xml
new file mode 100644
index 00000000000..55b58807e67
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720010" version="0" check="at least one" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17134.2087">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720011.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720011.xml
new file mode 100644
index 00000000000..dcf4ce7d8bb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720011" version="0" check="at least one" comment="win32kfull.sys (10.x) version is less than 10.0.17763.1852">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720012.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720012.xml
new file mode 100644
index 00000000000..d61af73efeb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720012" version="0" check="at least one" comment="win32kfull.sys (32-bit) (10.x) version is less than 10.0.17763.1852">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720013.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720013.xml
new file mode 100644
index 00000000000..d22870c10ff
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720013" version="0" check="at least one" comment="win32k.sys (10.x) version is less than 10.0.18362.1474">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720023"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720014.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720014.xml
new file mode 100644
index 00000000000..5c115e4d62d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720014" version="0" check="at least one" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.18362.1474">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720026"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720016.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720016.xml
new file mode 100644
index 00000000000..e6506fb158c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720016.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720016" version="0" check="at least one" comment="win32k.sys (10.x) version is less than 10.0.19041.906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720017.xml b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720017.xml
new file mode 100644
index 00000000000..d8a973ffb76
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270720000/oval_com.jovalcm.ms.cve_tst_2021270720017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270720017" version="0" check="at least one" comment="win32k.sys (32-bit) (10.x) version is less than 10.0.19041.906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270720011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270720029"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790001.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790001.xml
new file mode 100644
index 00000000000..22a1233a3a1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790001" version="0" check="at least one" comment="wmphoto.dll (10.x) version is less than 10.0.10240.18874">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790002.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790002.xml
new file mode 100644
index 00000000000..ec4860309b7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790002" version="0" check="at least one" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.10240.18874">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790003.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790003.xml
new file mode 100644
index 00000000000..aa5677466e7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790003" version="0" check="at least one" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.14393.4283">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790004.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790004.xml
new file mode 100644
index 00000000000..b4b6ed97aba
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790004" version="0" check="at least one" comment="wmphoto.dll (10.x) version is less than 10.0.14393.4283">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790005.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790005.xml
new file mode 100644
index 00000000000..ae171101efa
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790005" version="0" check="at least one" comment="wmphoto.dll (10.x) version is less than 10.0.17134.2087">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790006.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790006.xml
new file mode 100644
index 00000000000..e375677413b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790006" version="0" check="at least one" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.17134.2087">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790007.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790007.xml
new file mode 100644
index 00000000000..864867f201d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790007" version="0" check="at least one" comment="wmphoto.dll (10.x) version is less than 10.0.17763.1817">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790008.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790008.xml
new file mode 100644
index 00000000000..77a8744378b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790008" version="0" check="at least one" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.17763.1817">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790009.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790009.xml
new file mode 100644
index 00000000000..080800cffb3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790009" version="0" check="at least one" comment="wmphoto.dll (10.x) version is less than 10.0.18362.1440">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790010.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790010.xml
new file mode 100644
index 00000000000..74024303471
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790010" version="0" check="at least one" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.18362.1440">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790012.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790012.xml
new file mode 100644
index 00000000000..547c6eaa0bd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790012" version="0" check="at least one" comment="wmphoto.dll (10.x) version is less than 10.0.19041.867">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790013.xml b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790013.xml
new file mode 100644
index 00000000000..4c84d69a091
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270790000/oval_com.jovalcm.ms.cve_tst_2021270790013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270790013" version="0" check="at least one" comment="wmphoto.dll (32-bit) (10.x) version is less than 10.0.19041.867">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270790005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270790017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860001.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860001.xml
new file mode 100644
index 00000000000..7dc25befd5b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860001" version="0" check="at least one" comment="services.exe (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860002.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860002.xml
new file mode 100644
index 00000000000..b099abecfd7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860002" version="0" check="at least one" comment="services.exe (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860003.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860003.xml
new file mode 100644
index 00000000000..2f1b7ea48e8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860003" version="0" check="at least one" comment="services.exe (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860004.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860004.xml
new file mode 100644
index 00000000000..5fa88692891
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860004" version="0" check="at least one" comment="services.exe (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860005.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860005.xml
new file mode 100644
index 00000000000..17ec8d9ba18
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860005" version="0" check="at least one" comment="services.exe (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860006.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860006.xml
new file mode 100644
index 00000000000..6d7b2a74b11
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860006" version="0" check="at least one" comment="services.exe (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860008.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860008.xml
new file mode 100644
index 00000000000..ccaecc8e311
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860008" version="0" check="at least one" comment="services.exe (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860009.xml b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860009.xml
new file mode 100644
index 00000000000..e238b126e5d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270860000/oval_com.jovalcm.ms.cve_tst_2021270860009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270860009" version="0" check="at least one" comment="services.exe (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270860005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270860013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880001.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880001.xml
new file mode 100644
index 00000000000..cedad030634
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880001" version="0" check="at least one" comment="ntoskrnl.exe (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880002.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880002.xml
new file mode 100644
index 00000000000..111e1b71ac5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880002" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880003.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880003.xml
new file mode 100644
index 00000000000..f600dea3199
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880003" version="0" check="at least one" comment="ntoskrnl.exe (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880004.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880004.xml
new file mode 100644
index 00000000000..e2793ae384b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880004" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880005.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880005.xml
new file mode 100644
index 00000000000..e28f0175cfb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880005" version="0" check="at least one" comment="ntoskrnl.exe (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880006.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880006.xml
new file mode 100644
index 00000000000..99c548f00f7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880006" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880008.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880008.xml
new file mode 100644
index 00000000000..905d84f46d6
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880008" version="0" check="at least one" comment="ntoskrnl.exe (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880009.xml b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880009.xml
new file mode 100644
index 00000000000..4fa4ecb2863
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270880000/oval_com.jovalcm.ms.cve_tst_2021270880009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270880009" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270880013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890001.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890001.xml
new file mode 100644
index 00000000000..e27388dcc1c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890001" version="0" check="at least one" comment="inetcomm.dll (6.x) version is less than 6.1.7601.24576">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890002.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890002.xml
new file mode 100644
index 00000000000..2a97a465670
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890002" version="0" check="at least one" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.1.7601.24576">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890003.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890003.xml
new file mode 100644
index 00000000000..1bfe8389479
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890003" version="0" check="at least one" comment="inetcomm.dll (6.x) version is less than 6.0.6003.21096">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890004.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890004.xml
new file mode 100644
index 00000000000..9840d0d0217
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890004" version="0" check="at least one" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.2.9200.23328">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890005.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890005.xml
new file mode 100644
index 00000000000..7355e9009d5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890005" version="0" check="at least one" comment="inetcomm.dll (6.x) version is less than 6.2.9200.23328">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890006.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890006.xml
new file mode 100644
index 00000000000..fe477a7b872
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890006" version="0" check="at least one" comment="inetcomm.dll (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890007.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890007.xml
new file mode 100644
index 00000000000..f98b57e099c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890007" version="0" check="at least one" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890008.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890008.xml
new file mode 100644
index 00000000000..b70fdce0bee
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890008" version="0" check="at least one" comment="inetcomm.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890009.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890009.xml
new file mode 100644
index 00000000000..29e7828d3f9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890009" version="0" check="at least one" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890010.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890010.xml
new file mode 100644
index 00000000000..85a05392b91
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890010" version="0" check="at least one" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890011.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890011.xml
new file mode 100644
index 00000000000..e637d4f72f9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890011" version="0" check="at least one" comment="inetcomm.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890012.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890012.xml
new file mode 100644
index 00000000000..cf28695aece
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890012" version="0" check="at least one" comment="inetcomm.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890013.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890013.xml
new file mode 100644
index 00000000000..8989400496c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890013" version="0" check="at least one" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890014.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890014.xml
new file mode 100644
index 00000000000..3a6cb361963
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890014" version="0" check="at least one" comment="inetcomm.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890015.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890015.xml
new file mode 100644
index 00000000000..d953f987d72
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890015" version="0" check="at least one" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890023"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890016.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890016.xml
new file mode 100644
index 00000000000..f5dd6ee81c9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890016.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890016" version="0" check="at least one" comment="inetcomm.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890017.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890017.xml
new file mode 100644
index 00000000000..78dbeee50f3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890017" version="0" check="at least one" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890025"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890019.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890019.xml
new file mode 100644
index 00000000000..739405edc20
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890019.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890019" version="0" check="at least one" comment="inetcomm.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890027"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890020.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890020.xml
new file mode 100644
index 00000000000..8bdd53dc315
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890020" version="0" check="at least one" comment="inetcomm.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890022.xml b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890022.xml
new file mode 100644
index 00000000000..3ce969c67b3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270890000/oval_com.jovalcm.ms.cve_tst_2021270890022.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270890022" version="0" check="at least one" comment="inetcomm.dll (32-bit) (6.x) version is less than 6.0.6003.21096">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270890005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270890030"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910001.xml b/repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910001.xml
new file mode 100644
index 00000000000..c3afb4d8aa7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270910001" version="0" check="at least one" comment="ntoskrnl.exe (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270910003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270910003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910002.xml b/repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910002.xml
new file mode 100644
index 00000000000..1863ac7f249
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270910000/oval_com.jovalcm.ms.cve_tst_2021270910002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270910002" version="0" check="at least one" comment="ntoskrnl.exe (6.x) version is less than 6.2.9200.23327">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270910003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270910004"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930002.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930002.xml
new file mode 100644
index 00000000000..2f67c140227
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930002" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270930005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930003.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930003.xml
new file mode 100644
index 00000000000..d6b9a065aa5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930003" version="0" check="at least one" comment="ntoskrnl.exe (6.x) version is less than 6.0.6003.21095">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270910003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930004.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930004.xml
new file mode 100644
index 00000000000..a6e4125a804
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930004" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.2.9200.23327">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270930005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930006.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930006.xml
new file mode 100644
index 00000000000..27a796469ff
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930006" version="0" check="at least one" comment="ntoskrnl.exe (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930007.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930007.xml
new file mode 100644
index 00000000000..e985c506d49
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930007" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930008.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930008.xml
new file mode 100644
index 00000000000..a870ad826fd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930008" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930009.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930009.xml
new file mode 100644
index 00000000000..8c5bb273302
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930009" version="0" check="at least one" comment="ntoskrnl.exe (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270880003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930020.xml b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930020.xml
new file mode 100644
index 00000000000..09284bcec44
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270930000/oval_com.jovalcm.ms.cve_tst_2021270930020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270930020" version="0" check="at least one" comment="ntoskrnl.exe (32-bit) (6.x) version is less than 6.0.6003.21095">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270930005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270930028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940001.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940001.xml
new file mode 100644
index 00000000000..72747cdf117
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940001" version="0" check="at least one" comment="winload.efi (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940002.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940002.xml
new file mode 100644
index 00000000000..ac017d0c068
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940002" version="0" check="at least one" comment="winload.exe (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940003.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940003.xml
new file mode 100644
index 00000000000..d24e201a03f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940003" version="0" check="at least one" comment="winload.efi (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940004.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940004.xml
new file mode 100644
index 00000000000..bf6d7b999af
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940004" version="0" check="at least one" comment="winload.exe (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940005.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940005.xml
new file mode 100644
index 00000000000..edcb51c63c3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940005" version="0" check="at least one" comment="winload.efi (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940006.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940006.xml
new file mode 100644
index 00000000000..9019e8b68fe
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940006" version="0" check="at least one" comment="winload.exe (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940007.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940007.xml
new file mode 100644
index 00000000000..3c587f64e0b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940007" version="0" check="at least one" comment="winload.efi (32-bit) (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940008.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940008.xml
new file mode 100644
index 00000000000..9c2774981af
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940008" version="0" check="at least one" comment="winload.exe (32-bit) (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940009.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940009.xml
new file mode 100644
index 00000000000..9a89764a5d6
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940009" version="0" check="at least one" comment="winload.efi (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940010.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940010.xml
new file mode 100644
index 00000000000..85fd75b34ca
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940010" version="0" check="at least one" comment="winload.exe (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940011.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940011.xml
new file mode 100644
index 00000000000..110c1b3c712
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940011" version="0" check="at least one" comment="winload.efi (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940025"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940012.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940012.xml
new file mode 100644
index 00000000000..963e84ee73e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940012" version="0" check="at least one" comment="winload.exe (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940013"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940013.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940013.xml
new file mode 100644
index 00000000000..8f0f95f7d72
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940013" version="0" check="at least one" comment="winload.efi (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940029"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940014.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940014.xml
new file mode 100644
index 00000000000..4fb8450df69
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940014" version="0" check="at least one" comment="winload.exe (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940013"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940030"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940015.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940015.xml
new file mode 100644
index 00000000000..a8a52f5c79f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940015" version="0" check="at least one" comment="winload.efi (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940031"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940016.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940016.xml
new file mode 100644
index 00000000000..3c453255f78
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940016.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940016" version="0" check="at least one" comment="winload.exe (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940032"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940017.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940017.xml
new file mode 100644
index 00000000000..eef88a4a503
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940017" version="0" check="at least one" comment="winload.efi (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940033"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940018.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940018.xml
new file mode 100644
index 00000000000..72744f3b929
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940018.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940018" version="0" check="at least one" comment="winload.exe (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940034"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940019.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940019.xml
new file mode 100644
index 00000000000..c7f4915f5d3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940019.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940019" version="0" check="at least one" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940035"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940020.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940020.xml
new file mode 100644
index 00000000000..0052c5a5538
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940020" version="0" check="at least one" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940013"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940036"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940021.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940021.xml
new file mode 100644
index 00000000000..31dd0517c96
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940021.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940021" version="0" check="at least one" comment="winload.efi (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940037"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940022.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940022.xml
new file mode 100644
index 00000000000..93aa776ddd9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940022.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940022" version="0" check="at least one" comment="winload.exe (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940038"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940023.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940023.xml
new file mode 100644
index 00000000000..20090ef9dd0
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940023.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940023" version="0" check="at least one" comment="winload.efi (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940039"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940024.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940024.xml
new file mode 100644
index 00000000000..e5ce1eb400b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940024.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940024" version="0" check="at least one" comment="winload.exe (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940013"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940040"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940025.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940025.xml
new file mode 100644
index 00000000000..6ee87db9d63
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940025.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940025" version="0" check="at least one" comment="winload.efi (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940041"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940026.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940026.xml
new file mode 100644
index 00000000000..bcbbe6d1232
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940026.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940026" version="0" check="at least one" comment="winload.exe (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940042"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940027.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940027.xml
new file mode 100644
index 00000000000..6523ed3fa31
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940027.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940027" version="0" check="at least one" comment="winload.efi (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940043"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940028.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940028.xml
new file mode 100644
index 00000000000..835d4393533
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940028.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940028" version="0" check="at least one" comment="winload.exe (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940013"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940044"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940030.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940030.xml
new file mode 100644
index 00000000000..3e625ceba4e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940030.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940030" version="0" check="at least one" comment="winload.efi (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940046"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940031.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940031.xml
new file mode 100644
index 00000000000..e8eae67b226
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940031.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940031" version="0" check="at least one" comment="winload.exe (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940047"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940032.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940032.xml
new file mode 100644
index 00000000000..4725ba7358e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940032.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940032" version="0" check="at least one" comment="winload.efi (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940048"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940033.xml b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940033.xml
new file mode 100644
index 00000000000..7a9b63b9610
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270940000/oval_com.jovalcm.ms.cve_tst_2021270940033.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270940033" version="0" check="at least one" comment="winload.exe (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270940013"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270940049"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950001.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950001.xml
new file mode 100644
index 00000000000..9c302f40f21
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950001" version="0" check="at least one" comment="wmvdecod.dll (6.x) version is less than 6.3.9600.19988">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950002.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950002.xml
new file mode 100644
index 00000000000..79f737a131f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950002" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.3.9600.19988">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950003.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950003.xml
new file mode 100644
index 00000000000..5cb120fd76b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950003" version="0" check="at least one" comment="wmvdecod.dll (11.x) version is less than 11.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950004.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950004.xml
new file mode 100644
index 00000000000..433d8b7eb73
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950004" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950005.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950005.xml
new file mode 100644
index 00000000000..bb6b5b0db41
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950005" version="0" check="at least one" comment="wmvdecod.dll (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950006.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950006.xml
new file mode 100644
index 00000000000..feea4e68db5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950006" version="0" check="at least one" comment="wmvdecod.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950007.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950007.xml
new file mode 100644
index 00000000000..815c876c8e1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950007" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950008.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950008.xml
new file mode 100644
index 00000000000..e37fc473f35
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950008" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950009.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950009.xml
new file mode 100644
index 00000000000..d6a702e6af0
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950009" version="0" check="at least one" comment="wmvdecod.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950010.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950010.xml
new file mode 100644
index 00000000000..936ba46ab83
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950010" version="0" check="at least one" comment="wmvdecod.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950011.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950011.xml
new file mode 100644
index 00000000000..f970108680b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950011" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950012.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950012.xml
new file mode 100644
index 00000000000..56d91c18d20
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950012" version="0" check="at least one" comment="wmvdecod.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950013.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950013.xml
new file mode 100644
index 00000000000..f640e22b564
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950013" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950023"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950014.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950014.xml
new file mode 100644
index 00000000000..b014605ca77
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950014" version="0" check="at least one" comment="wmvdecod.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950015.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950015.xml
new file mode 100644
index 00000000000..494ec507366
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950015" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950025"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950017.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950017.xml
new file mode 100644
index 00000000000..b1c572c9e60
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950017" version="0" check="at least one" comment="wmvdecod.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950027"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950018.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950018.xml
new file mode 100644
index 00000000000..7c25e15200c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950018.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950018" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950020.xml b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950020.xml
new file mode 100644
index 00000000000..efe7869245a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270950000/oval_com.jovalcm.ms.cve_tst_2021270950020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270950020" version="0" check="at least one" comment="wmvdecod.dll (32-bit) (11.x) version is less than 11.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270950010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270950032"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960005.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960005.xml
new file mode 100644
index 00000000000..a8f6f07ef1d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960005" version="0" check="at least one" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960006.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960006.xml
new file mode 100644
index 00000000000..704cded4ceb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960006" version="0" check="at least one" comment="ntfs.sys (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960007.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960007.xml
new file mode 100644
index 00000000000..4155fcf2c7b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960007" version="0" check="at least one" comment="ntfs.sys (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960008.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960008.xml
new file mode 100644
index 00000000000..63bd7bf4e3e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960008" version="0" check="at least one" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960009.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960009.xml
new file mode 100644
index 00000000000..4fd12830ea8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960009" version="0" check="at least one" comment="ntfs.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960010.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960010.xml
new file mode 100644
index 00000000000..b3429cc9327
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960010" version="0" check="at least one" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960011.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960011.xml
new file mode 100644
index 00000000000..1f646f94d04
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960011" version="0" check="at least one" comment="ntfs.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960012.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960012.xml
new file mode 100644
index 00000000000..66ff7e2333f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960012" version="0" check="at least one" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960014.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960014.xml
new file mode 100644
index 00000000000..331e8d6c4b1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960014" version="0" check="at least one" comment="ntfs.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960015.xml b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960015.xml
new file mode 100644
index 00000000000..bcdab054a69
--- /dev/null
+++ b/repository/tests/windows/file_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960015" version="0" check="at least one" comment="ntfs.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021270960007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110001.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110001.xml
new file mode 100644
index 00000000000..4fb420ce276
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110001" version="0" check="at least one" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110002.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110002.xml
new file mode 100644
index 00000000000..9532fd166dd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110002" version="0" check="at least one" comment="ahcache.sys (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110003.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110003.xml
new file mode 100644
index 00000000000..b26e708a4c8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110003" version="0" check="at least one" comment="ahcache.sys (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110004.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110004.xml
new file mode 100644
index 00000000000..c1842236617
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110004" version="0" check="at least one" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110005.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110005.xml
new file mode 100644
index 00000000000..bd3013092d4
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110005" version="0" check="at least one" comment="ahcache.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110006.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110006.xml
new file mode 100644
index 00000000000..688041d0d3d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110006" version="0" check="at least one" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110007.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110007.xml
new file mode 100644
index 00000000000..fca408c2be7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110007" version="0" check="at least one" comment="ahcache.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110008.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110008.xml
new file mode 100644
index 00000000000..09daeccf73c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110008" version="0" check="at least one" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110010.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110010.xml
new file mode 100644
index 00000000000..ea854a633e5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110010" version="0" check="at least one" comment="ahcache.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110011.xml b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110011.xml
new file mode 100644
index 00000000000..44293a721ec
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283110000/oval_com.jovalcm.ms.cve_tst_2021283110011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283110011" version="0" check="at least one" comment="ahcache.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283110003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283110015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160001.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160001.xml
new file mode 100644
index 00000000000..16969d0c03d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160001" version="0" check="at least one" comment="wlansvc.dll (6.x) version is less than 6.3.9600.19987">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160002.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160002.xml
new file mode 100644
index 00000000000..8e1077c1461
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160002" version="0" check="at least one" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.3.9600.19987">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160003.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160003.xml
new file mode 100644
index 00000000000..4a4c8ecd554
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160003" version="0" check="at least one" comment="wlansvc.dll (32-bit) (6.x) version is less than 6.2.9200.23332">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160004.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160004.xml
new file mode 100644
index 00000000000..295d69f9390
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160004" version="0" check="at least one" comment="wlansvc.dll (6.x) version is less than 6.2.9200.23332">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160005.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160005.xml
new file mode 100644
index 00000000000..f56c05cead0
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160005" version="0" check="at least one" comment="wlansvc.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160006.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160006.xml
new file mode 100644
index 00000000000..7b887a70e96
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160006" version="0" check="at least one" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160007.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160007.xml
new file mode 100644
index 00000000000..ccc2985625f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160007" version="0" check="at least one" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160008.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160008.xml
new file mode 100644
index 00000000000..831fbb74379
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160008" version="0" check="at least one" comment="wlansvc.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160009.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160009.xml
new file mode 100644
index 00000000000..557faac9572
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160009" version="0" check="at least one" comment="wlansvc.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160010.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160010.xml
new file mode 100644
index 00000000000..9f94947fea3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160010" version="0" check="at least one" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160011.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160011.xml
new file mode 100644
index 00000000000..e956f18e9c9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160011" version="0" check="at least one" comment="wlansvc.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160012.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160012.xml
new file mode 100644
index 00000000000..836c410d6ad
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160012" version="0" check="at least one" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160013.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160013.xml
new file mode 100644
index 00000000000..6dd5d06fc28
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160013" version="0" check="at least one" comment="wlansvc.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160014.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160014.xml
new file mode 100644
index 00000000000..8ce256d8c83
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160014" version="0" check="at least one" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160016.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160016.xml
new file mode 100644
index 00000000000..1bb51d18581
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160016.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160016" version="0" check="at least one" comment="wlansvc.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160017.xml b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160017.xml
new file mode 100644
index 00000000000..6c21137fc6b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283160000/oval_com.jovalcm.ms.cve_tst_2021283160017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283160017" version="0" check="at least one" comment="wlansvc.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283160007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283160025"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170001.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170001.xml
new file mode 100644
index 00000000000..6fe32e0666b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170001" version="0" check="at least one" comment="windowscodecs.dll (6.x) version is less than 6.3.9600.19988">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170002.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170002.xml
new file mode 100644
index 00000000000..893e005d6fc
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170002" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.3.9600.19988">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170003.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170003.xml
new file mode 100644
index 00000000000..2aea4736ab2
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170003" version="0" check="at least one" comment="windowscodecs.dll (7.x) version is less than 7.0.6003.21090">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170004.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170004.xml
new file mode 100644
index 00000000000..9c4addad2e5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170004" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170005.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170005.xml
new file mode 100644
index 00000000000..02ca4448951
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170005" version="0" check="at least one" comment="windowscodecs.dll (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170006.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170006.xml
new file mode 100644
index 00000000000..46569223991
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170006" version="0" check="at least one" comment="windowscodecs.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170007.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170007.xml
new file mode 100644
index 00000000000..c9bdf89a8d4
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170007" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170008.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170008.xml
new file mode 100644
index 00000000000..4ec755995b8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170008" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170009.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170009.xml
new file mode 100644
index 00000000000..839d64b0463
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170009" version="0" check="at least one" comment="windowscodecs.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170010.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170010.xml
new file mode 100644
index 00000000000..40690499aeb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170010" version="0" check="at least one" comment="windowscodecs.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170011.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170011.xml
new file mode 100644
index 00000000000..0005af351bf
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170011" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170012.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170012.xml
new file mode 100644
index 00000000000..3b816e7df33
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170012" version="0" check="at least one" comment="windowscodecs.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170013.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170013.xml
new file mode 100644
index 00000000000..9d816954d54
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170013" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170023"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170014.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170014.xml
new file mode 100644
index 00000000000..ef4785311d3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170014" version="0" check="at least one" comment="windowscodecs.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170015.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170015.xml
new file mode 100644
index 00000000000..bd9d8fca3f9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170015" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170025"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170017.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170017.xml
new file mode 100644
index 00000000000..5dfa5697aee
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170017" version="0" check="at least one" comment="windowscodecs.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170027"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170018.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170018.xml
new file mode 100644
index 00000000000..f5751522fb6
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170018.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170018" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170020.xml b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170020.xml
new file mode 100644
index 00000000000..ef370333469
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283170000/oval_com.jovalcm.ms.cve_tst_2021283170020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283170020" version="0" check="at least one" comment="windowscodecs.dll (32-bit) (7.x) version is less than 7.0.6003.21090">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283170010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283170032"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180001.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180001.xml
new file mode 100644
index 00000000000..00e712188d6
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180001" version="0" check="at least one" comment="gdiplus.dll (6.x) version is less than 6.3.9600.19987">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180002.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180002.xml
new file mode 100644
index 00000000000..dad30e7bed5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180002" version="0" check="at least one" comment="gdiplus.dll (5.x) version is less than 5.2.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180004"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180003.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180003.xml
new file mode 100644
index 00000000000..861394519ff
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180003" version="0" check="at least one" comment="gdiplus.dll (6.x) version is less than 6.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180004.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180004.xml
new file mode 100644
index 00000000000..1cba313ccff
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180004" version="0" check="at least one" comment="gdi32.dll (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180005.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180005.xml
new file mode 100644
index 00000000000..9eb7caaad4c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180005" version="0" check="at least one" comment="gdi32.dll (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180006.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180006.xml
new file mode 100644
index 00000000000..00c85386ad8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180006" version="0" check="at least one" comment="gdiplus.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180007.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180007.xml
new file mode 100644
index 00000000000..5bf1ee58361
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180007" version="0" check="at least one" comment="gdiplus.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180008.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180008.xml
new file mode 100644
index 00000000000..c09c37139bb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180008" version="0" check="at least one" comment="gdiplus.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180009.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180009.xml
new file mode 100644
index 00000000000..fe387526502
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180009" version="0" check="at least one" comment="gdiplus.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180010.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180010.xml
new file mode 100644
index 00000000000..4fb30a6a5d5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180010" version="0" check="at least one" comment="gdiplus.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180012.xml b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180012.xml
new file mode 100644
index 00000000000..44d842577c8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283180000/oval_com.jovalcm.ms.cve_tst_2021283180012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283180012" version="0" check="at least one" comment="gdiplus.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283180009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283180022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190001.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190001.xml
new file mode 100644
index 00000000000..574ee695b61
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190001" version="0" check="at least one" comment="tcpip.sys (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190002.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190002.xml
new file mode 100644
index 00000000000..cdc4bd11d95
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190002" version="0" check="at least one" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190003.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190003.xml
new file mode 100644
index 00000000000..12d6733d407
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190003" version="0" check="at least one" comment="tcpip.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190004.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190004.xml
new file mode 100644
index 00000000000..e2076c338ab
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190004" version="0" check="at least one" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190005.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190005.xml
new file mode 100644
index 00000000000..0fe0fce3bc1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190005" version="0" check="at least one" comment="tcpip.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190006.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190006.xml
new file mode 100644
index 00000000000..1774a9e106c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190006" version="0" check="at least one" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190008.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190008.xml
new file mode 100644
index 00000000000..8ba9ba77061
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190008" version="0" check="at least one" comment="tcpip.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190009.xml b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190009.xml
new file mode 100644
index 00000000000..99781099052
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283190000/oval_com.jovalcm.ms.cve_tst_2021283190009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283190009" version="0" check="at least one" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283190013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200001.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200001.xml
new file mode 100644
index 00000000000..0608c402cf0
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200001" version="0" check="at least one" comment="psmserviceexthost.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200002.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200002.xml
new file mode 100644
index 00000000000..7168bc9c55b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200002" version="0" check="at least one" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200003.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200003.xml
new file mode 100644
index 00000000000..11125033e41
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200003" version="0" check="at least one" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200004.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200004.xml
new file mode 100644
index 00000000000..ddfe6286e2b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200004" version="0" check="at least one" comment="psmserviceexthost.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200005.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200005.xml
new file mode 100644
index 00000000000..7b776f58ad9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200005" version="0" check="at least one" comment="psmserviceexthost.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200006.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200006.xml
new file mode 100644
index 00000000000..344af25b93f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200006" version="0" check="at least one" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200007.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200007.xml
new file mode 100644
index 00000000000..7ef72b603b3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200007" version="0" check="at least one" comment="psmserviceexthost.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200008.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200008.xml
new file mode 100644
index 00000000000..51bdfd589d0
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200008" version="0" check="at least one" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200009.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200009.xml
new file mode 100644
index 00000000000..e2e59e3f0a2
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200009" version="0" check="at least one" comment="psmserviceexthost.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200010.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200010.xml
new file mode 100644
index 00000000000..e348af4b8ca
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200010" version="0" check="at least one" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200012.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200012.xml
new file mode 100644
index 00000000000..c447492985c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200012" version="0" check="at least one" comment="psmserviceexthost.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200013.xml b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200013.xml
new file mode 100644
index 00000000000..3af2df63504
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283200000/oval_com.jovalcm.ms.cve_tst_2021283200013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283200013" version="0" check="at least one" comment="psmserviceexthost.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283200005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283200017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230001.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230001.xml
new file mode 100644
index 00000000000..1d7e52dcaae
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230001" version="0" check="at least one" comment="dnsapi.dll (6.x) version is less than 6.3.9600.19990">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230002.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230002.xml
new file mode 100644
index 00000000000..fcaa174e898
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230002" version="0" check="at least one" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.3.9600.19990">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230003.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230003.xml
new file mode 100644
index 00000000000..8363ec9bd91
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230003" version="0" check="at least one" comment="dnsapi.dll (6.x) version is less than 6.0.6003.21094">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230004.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230004.xml
new file mode 100644
index 00000000000..9aea90aa63b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230004" version="0" check="at least one" comment="dnscacheugc.exe (6.x) version is less than 6.0.6003.21094">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230005.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230005.xml
new file mode 100644
index 00000000000..452829152c8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230005" version="0" check="at least one" comment="dnsrslvr.dll (6.x) version is less than 6.0.6003.21094">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230006.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230006.xml
new file mode 100644
index 00000000000..e8f3da10496
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230006" version="0" check="at least one" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230007.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230007.xml
new file mode 100644
index 00000000000..70eeb1892f4
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230007" version="0" check="at least one" comment="dnsapi.dll (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230008.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230008.xml
new file mode 100644
index 00000000000..a8a246c576d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230008" version="0" check="at least one" comment="dnsapi.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230009.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230009.xml
new file mode 100644
index 00000000000..c8bf10ce5e2
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230009" version="0" check="at least one" comment="dnsrslvr.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230010.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230010.xml
new file mode 100644
index 00000000000..3f270f810a7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230010" version="0" check="at least one" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230011.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230011.xml
new file mode 100644
index 00000000000..4d89388287e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230011" version="0" check="at least one" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230014"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230027"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230012.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230012.xml
new file mode 100644
index 00000000000..d1581ad09d1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230012" version="0" check="at least one" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230013.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230013.xml
new file mode 100644
index 00000000000..d891a7f4b08
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230013" version="0" check="at least one" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230014"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230029"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230014.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230014.xml
new file mode 100644
index 00000000000..8ba3e48d2d4
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230014" version="0" check="at least one" comment="dnsapi.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230030"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230015.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230015.xml
new file mode 100644
index 00000000000..44d2b5d7d82
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230015" version="0" check="at least one" comment="dnsrslvr.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230031"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230016.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230016.xml
new file mode 100644
index 00000000000..76fef61047c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230016.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230016" version="0" check="at least one" comment="dnsapi.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230032"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230017.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230017.xml
new file mode 100644
index 00000000000..a6a2eb9f67a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230017" version="0" check="at least one" comment="dnsrslvr.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230033"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230018.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230018.xml
new file mode 100644
index 00000000000..c9d76d7704a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230018.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230018" version="0" check="at least one" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230034"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230019.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230019.xml
new file mode 100644
index 00000000000..fb15907a2eb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230019.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230019" version="0" check="at least one" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230014"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230035"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230020.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230020.xml
new file mode 100644
index 00000000000..2585622a660
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230020" version="0" check="at least one" comment="dnsapi.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230036"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230021.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230021.xml
new file mode 100644
index 00000000000..c49f0a4cded
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230021.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230021" version="0" check="at least one" comment="dnsrslvr.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230037"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230022.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230022.xml
new file mode 100644
index 00000000000..5b5f2d1e14d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230022.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230022" version="0" check="at least one" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230038"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230023.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230023.xml
new file mode 100644
index 00000000000..9d3ce427efc
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230023.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230023" version="0" check="at least one" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230014"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230039"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230024.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230024.xml
new file mode 100644
index 00000000000..e2d66ea42b0
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230024.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230024" version="0" check="at least one" comment="dnsapi.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230040"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230025.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230025.xml
new file mode 100644
index 00000000000..3f9e24d0e1c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230025.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230025" version="0" check="at least one" comment="dnsrslvr.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230041"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230026.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230026.xml
new file mode 100644
index 00000000000..5c2f37b899d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230026.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230026" version="0" check="at least one" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230042"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230027.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230027.xml
new file mode 100644
index 00000000000..95c37c36924
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230027.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230027" version="0" check="at least one" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230014"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230043"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230029.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230029.xml
new file mode 100644
index 00000000000..3961fdfc1d3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230029.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230029" version="0" check="at least one" comment="dnsapi.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230045"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230030.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230030.xml
new file mode 100644
index 00000000000..a5113a251dc
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230030.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230030" version="0" check="at least one" comment="dnsrslvr.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230011"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230046"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230031.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230031.xml
new file mode 100644
index 00000000000..11369f348ed
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230031.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230031" version="0" check="at least one" comment="dnsapi.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230047"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230032.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230032.xml
new file mode 100644
index 00000000000..e7b759fb23c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230032.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230032" version="0" check="at least one" comment="dnsrslvr.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230014"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230048"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230034.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230034.xml
new file mode 100644
index 00000000000..20f348f9307
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230034.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230034" version="0" check="at least one" comment="dnsapi.dll (32-bit) (6.x) version is less than 6.0.6003.21094">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230050"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230035.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230035.xml
new file mode 100644
index 00000000000..72db5df0426
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230035.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230035" version="0" check="at least one" comment="dnscacheugc.exe (32-bit) (6.x) version is less than 6.0.6003.21094">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230017"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230053"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230036.xml b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230036.xml
new file mode 100644
index 00000000000..67988bec5f1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283230000/oval_com.jovalcm.ms.cve_tst_2021283230036.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283230036" version="0" check="at least one" comment="dnsrslvr.dll (32-bit) (6.x) version is less than 6.0.6003.21094">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283230018"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283230056"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240002.xml b/repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240002.xml
new file mode 100644
index 00000000000..4300da11339
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283240002" version="0" check="at least one" comment="srv2.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240004"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283240004"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240003.xml b/repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240003.xml
new file mode 100644
index 00000000000..464fe9893d7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283240000/oval_com.jovalcm.ms.cve_tst_2021283240003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283240003" version="0" check="at least one" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283240007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250001.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250001.xml
new file mode 100644
index 00000000000..4a89471111f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250001" version="0" check="at least one" comment="srv2.sys (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283250003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250002.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250002.xml
new file mode 100644
index 00000000000..6010617080e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250002" version="0" check="at least one" comment="srv2.sys (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283250005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250003.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250003.xml
new file mode 100644
index 00000000000..77d33536a09
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250003" version="0" check="at least one" comment="srv2.sys (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283250005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250004.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250004.xml
new file mode 100644
index 00000000000..567249d2380
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250004" version="0" check="at least one" comment="srv2.sys (32-bit) (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283250003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250005.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250005.xml
new file mode 100644
index 00000000000..4ba0300a0b1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250005" version="0" check="at least one" comment="srv2.sys (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240004"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250006.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250006.xml
new file mode 100644
index 00000000000..e93be3507bd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250006" version="0" check="at least one" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250007.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250007.xml
new file mode 100644
index 00000000000..b852cefd6a6
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250007" version="0" check="at least one" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250008.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250008.xml
new file mode 100644
index 00000000000..8a77a1e383c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250008" version="0" check="at least one" comment="srv2.sys (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240004"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250009.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250009.xml
new file mode 100644
index 00000000000..3e6bc4c8bfd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250009" version="0" check="at least one" comment="srv2.sys (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240004"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250010.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250010.xml
new file mode 100644
index 00000000000..6ef72a803c3
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250010" version="0" check="at least one" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250011.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250011.xml
new file mode 100644
index 00000000000..2f194a2224a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250011" version="0" check="at least one" comment="srv2.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240004"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250012.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250012.xml
new file mode 100644
index 00000000000..025e52b5de7
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250012" version="0" check="at least one" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250013.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250013.xml
new file mode 100644
index 00000000000..9c5ba37a07e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250013" version="0" check="at least one" comment="srv2.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240004"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250014.xml b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250014.xml
new file mode 100644
index 00000000000..811af63f1e6
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283250000/oval_com.jovalcm.ms.cve_tst_2021283250014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283250014" version="0" check="at least one" comment="srv2.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283240006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283250022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260001.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260001.xml
new file mode 100644
index 00000000000..a87f231a155
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260001" version="0" check="at least one" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260002.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260002.xml
new file mode 100644
index 00000000000..5f19667a133
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260002" version="0" check="at least one" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260003.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260003.xml
new file mode 100644
index 00000000000..7f9c76ca373
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260003" version="0" check="at least one" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260004.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260004.xml
new file mode 100644
index 00000000000..1bf56ab9a36
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260004" version="0" check="at least one" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260005.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260005.xml
new file mode 100644
index 00000000000..a58641dd883
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260005" version="0" check="at least one" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260006.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260006.xml
new file mode 100644
index 00000000000..30d774f6049
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260006" version="0" check="at least one" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260007.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260007.xml
new file mode 100644
index 00000000000..c7fc4c78788
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260007" version="0" check="at least one" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260008.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260008.xml
new file mode 100644
index 00000000000..34f1418811f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260008" version="0" check="at least one" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260009.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260009.xml
new file mode 100644
index 00000000000..154f081bcad
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260009" version="0" check="at least one" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260010.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260010.xml
new file mode 100644
index 00000000000..4b4297aaf15
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260010" version="0" check="at least one" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260014"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260012.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260012.xml
new file mode 100644
index 00000000000..62b264cbce9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260012" version="0" check="at least one" comment="appxdeploymentserver.dll (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260013.xml b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260013.xml
new file mode 100644
index 00000000000..89c660ead84
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283260000/oval_com.jovalcm.ms.cve_tst_2021283260013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283260013" version="0" check="at least one" comment="appxdeploymentserver.dll (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283260005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283260017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270001.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270001.xml
new file mode 100644
index 00000000000..c093793fd1d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270001" version="0" check="at least one" comment="msrpc.sys (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270002.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270002.xml
new file mode 100644
index 00000000000..b6416422d11
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270002" version="0" check="at least one" comment="msrpc.sys (32-bit) (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270003.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270003.xml
new file mode 100644
index 00000000000..7a9a24508eb
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270003" version="0" check="at least one" comment="msrpc.sys (6.x) version is less than 6.0.6003.21095">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270004.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270004.xml
new file mode 100644
index 00000000000..7d36c362447
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270004" version="0" check="at least one" comment="msrpc.sys (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270005.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270005.xml
new file mode 100644
index 00000000000..fc0b2d14f00
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270005" version="0" check="at least one" comment="msrpc.sys (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270006.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270006.xml
new file mode 100644
index 00000000000..f53a4619692
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270006" version="0" check="at least one" comment="msrpc.sys (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270007.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270007.xml
new file mode 100644
index 00000000000..0902ce95115
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270007" version="0" check="at least one" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270008.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270008.xml
new file mode 100644
index 00000000000..4ee615e8403
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270008" version="0" check="at least one" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270009.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270009.xml
new file mode 100644
index 00000000000..f00dd9ffa4c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270009" version="0" check="at least one" comment="msrpc.sys (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270010.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270010.xml
new file mode 100644
index 00000000000..09aab082bab
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270010" version="0" check="at least one" comment="msrpc.sys (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270011.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270011.xml
new file mode 100644
index 00000000000..b55b3d845bd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270011" version="0" check="at least one" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270012.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270012.xml
new file mode 100644
index 00000000000..a264e6ec487
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270012" version="0" check="at least one" comment="msrpc.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270013.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270013.xml
new file mode 100644
index 00000000000..4c0ebbd3567
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270013" version="0" check="at least one" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270014.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270014.xml
new file mode 100644
index 00000000000..bcaf53b8cbc
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270014" version="0" check="at least one" comment="msrpc.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270015.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270015.xml
new file mode 100644
index 00000000000..40d56b00127
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270015.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270015" version="0" check="at least one" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270023"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270017.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270017.xml
new file mode 100644
index 00000000000..9a0205a90cf
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270017" version="0" check="at least one" comment="msrpc.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270025"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270018.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270018.xml
new file mode 100644
index 00000000000..b9e78bae86a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270018.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270018" version="0" check="at least one" comment="msrpc.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270026"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270020.xml b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270020.xml
new file mode 100644
index 00000000000..addab647469
--- /dev/null
+++ b/repository/tests/windows/file_test/2021283270000/oval_com.jovalcm.ms.cve_tst_2021283270020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283270020" version="0" check="at least one" comment="msrpc.sys (32-bit) (6.x) version is less than 6.0.6003.21095">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283270005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283270028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380001.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380001.xml
new file mode 100644
index 00000000000..d0859241fda
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380001" version="0" check="at least one" comment="condrv.sys (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380002.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380002.xml
new file mode 100644
index 00000000000..bf5c22af019
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380002" version="0" check="at least one" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380003.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380003.xml
new file mode 100644
index 00000000000..8950b36dd14
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380003" version="0" check="at least one" comment="condrv.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380004.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380004.xml
new file mode 100644
index 00000000000..1d2a96bbc26
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380004" version="0" check="at least one" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380005.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380005.xml
new file mode 100644
index 00000000000..91869e6a399
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380005" version="0" check="at least one" comment="condrv.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380006.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380006.xml
new file mode 100644
index 00000000000..dc6cbee06bd
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380006" version="0" check="at least one" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380008.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380008.xml
new file mode 100644
index 00000000000..5c90ff04929
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380008" version="0" check="at least one" comment="condrv.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380009.xml b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380009.xml
new file mode 100644
index 00000000000..26a2d0768e9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284380000/oval_com.jovalcm.ms.cve_tst_2021284380009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284380009" version="0" check="at least one" comment="condrv.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284380005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284380013"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390001.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390001.xml
new file mode 100644
index 00000000000..8ae7514755e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390001" version="0" check="at least one" comment="tcpip.sys (6.x) version is less than 6.3.9600.19984">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284390003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390002.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390002.xml
new file mode 100644
index 00000000000..3651bfe3f43
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390002" version="0" check="at least one" comment="tcpip.sys (32-bit) (6.x) version is less than 6.3.9600.19984">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284390005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390003.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390003.xml
new file mode 100644
index 00000000000..54411fab58b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390003" version="0" check="at least one" comment="tcpip.sys (6.x) version is less than 6.0.6003.21088">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284390003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390004.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390004.xml
new file mode 100644
index 00000000000..5d63b47efd6
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390004" version="0" check="at least one" comment="tcpip.sys (32-bit) (6.x) version is less than 6.2.9200.23320">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284390005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390005.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390005.xml
new file mode 100644
index 00000000000..5495d2cea17
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390005" version="0" check="at least one" comment="tcpip.sys (6.x) version is less than 6.2.9200.23320">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284390003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390006.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390006.xml
new file mode 100644
index 00000000000..bd4cda85e16
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390006" version="0" check="at least one" comment="tcpip.sys (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390007.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390007.xml
new file mode 100644
index 00000000000..d2c78fa6fd0
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390007" version="0" check="at least one" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390008.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390008.xml
new file mode 100644
index 00000000000..126f4949724
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390008" version="0" check="at least one" comment="tcpip.sys (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390009.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390009.xml
new file mode 100644
index 00000000000..95d91cd12b9
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390009" version="0" check="at least one" comment="tcpip.sys (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021283190003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390020.xml b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390020.xml
new file mode 100644
index 00000000000..781e1c0a32c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284390000/oval_com.jovalcm.ms.cve_tst_2021284390020.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284390020" version="0" check="at least one" comment="tcpip.sys (32-bit) (6.x) version is less than 6.0.6003.21088">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284390005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284390028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440001.xml b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440001.xml
new file mode 100644
index 00000000000..ccf14872d83
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284440001" version="0" check="at least one" comment="vmswitch.sys (32-bit) (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284440003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284440003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440002.xml b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440002.xml
new file mode 100644
index 00000000000..c5d2bc432ed
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284440002" version="0" check="at least one" comment="vmswitch.sys (6.x) version is less than 6.3.9600.19994">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284440005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284440006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440003.xml b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440003.xml
new file mode 100644
index 00000000000..997cbbe5faf
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284440003" version="0" check="at least one" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284440009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440004.xml b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440004.xml
new file mode 100644
index 00000000000..b889bc0472f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284440004" version="0" check="at least one" comment="hvax64.exe (10.x) version is less than 10.0.10240.18906">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284440012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440007.xml b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440007.xml
new file mode 100644
index 00000000000..f03fad63508
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284440007" version="0" check="at least one" comment="hvax64.exe (32-bit) (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284440015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440008.xml b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440008.xml
new file mode 100644
index 00000000000..df1e763a462
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284440000/oval_com.jovalcm.ms.cve_tst_2021284440008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284440008" version="0" check="at least one" comment="hvax64.exe (10.x) version is less than 10.0.17134.2145">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021264160005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284440016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450001.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450001.xml
new file mode 100644
index 00000000000..7a52076a081
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450001" version="0" check="at least one" comment="nfssvr.sys (6.x) version is less than 6.3.9600.19988">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450002.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450002.xml
new file mode 100644
index 00000000000..7b97d8ea459
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450002" version="0" check="at least one" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.3.9600.19988">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450003.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450003.xml
new file mode 100644
index 00000000000..86d627a7713
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450003" version="0" check="at least one" comment="msnfsflt.sys (6.x) version is less than 6.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450004.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450004.xml
new file mode 100644
index 00000000000..eaa8787cb93
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450004" version="0" check="at least one" comment="nfssvr.sys (6.x) version is less than 6.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450010"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450005.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450005.xml
new file mode 100644
index 00000000000..07baa5cf0b4
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450005" version="0" check="at least one" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.2.9200.23326">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450011"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450006.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450006.xml
new file mode 100644
index 00000000000..4f0153c747f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450006" version="0" check="at least one" comment="nfssvr.sys (6.x) version is less than 6.2.9200.23326">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450007.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450007.xml
new file mode 100644
index 00000000000..42b2e3d725e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450007" version="0" check="at least one" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450008.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450008.xml
new file mode 100644
index 00000000000..2a91fe84b17
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450008" version="0" check="at least one" comment="nfssvr.sys (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450009.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450009.xml
new file mode 100644
index 00000000000..59f0e290982
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450009" version="0" check="at least one" comment="nfssvr.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450010.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450010.xml
new file mode 100644
index 00000000000..2d764428602
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450010" version="0" check="at least one" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450020"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450011.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450011.xml
new file mode 100644
index 00000000000..4c5d1035099
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450011" version="0" check="at least one" comment="msnfsflt.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450023"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450012.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450012.xml
new file mode 100644
index 00000000000..2885fd564e5
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450012.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450012" version="0" check="at least one" comment="nfssvr.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450013.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450013.xml
new file mode 100644
index 00000000000..05be3bce624
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450013" version="0" check="at least one" comment="msnfsflt.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450027"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450014.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450014.xml
new file mode 100644
index 00000000000..bc204f6b2e1
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450014" version="0" check="at least one" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450028"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450016.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450016.xml
new file mode 100644
index 00000000000..13aaca43344
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450016.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450016" version="0" check="at least one" comment="msnfsflt.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450010"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450030"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450017.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450017.xml
new file mode 100644
index 00000000000..ece69823b50
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450017.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450017" version="0" check="at least one" comment="nfssvr.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450009"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450031"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450018.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450018.xml
new file mode 100644
index 00000000000..37cc2c87484
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450018.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450018" version="0" check="at least one" comment="msnfsflt.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450012"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450032"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450019.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450019.xml
new file mode 100644
index 00000000000..e40d541119c
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450019.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450019" version="0" check="at least one" comment="nfssvr.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450008"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450033"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450021.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450021.xml
new file mode 100644
index 00000000000..bf82f2dc82f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450021.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450021" version="0" check="at least one" comment="msnfsflt.sys (32-bit) (6.x) version is less than 6.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450014"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450037"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450022.xml b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450022.xml
new file mode 100644
index 00000000000..fd65b226a7f
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284450000/oval_com.jovalcm.ms.cve_tst_2021284450022.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284450022" version="0" check="at least one" comment="nfssvr.sys (32-bit) (6.x) version is less than 6.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284450005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284450038"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460001.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460001.xml
new file mode 100644
index 00000000000..18e43678cd8
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460001.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460001" version="0" check="at least one" comment="portmap.sys (6.x) version is less than 6.3.9600.19987">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460003"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460002.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460002.xml
new file mode 100644
index 00000000000..b9cdb44fd4d
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460002.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460002" version="0" check="at least one" comment="portmap.sys (32-bit) (6.x) version is less than 6.3.9600.19987">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460006"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460003.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460003.xml
new file mode 100644
index 00000000000..c9da89aaf20
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460003.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460003" version="0" check="at least one" comment="portmap.sys (6.x) version is less than 6.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460007"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460004.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460004.xml
new file mode 100644
index 00000000000..5449c5b5376
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460004.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460004" version="0" check="at least one" comment="portmap.sys (32-bit) (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460008"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460005.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460005.xml
new file mode 100644
index 00000000000..13807206bec
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460005.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460005" version="0" check="at least one" comment="portmap.sys (6.x) version is less than 6.2.9200.23324">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460003"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460009"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460006.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460006.xml
new file mode 100644
index 00000000000..3c562339f47
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460006.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460006" version="0" check="at least one" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460012"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460007.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460007.xml
new file mode 100644
index 00000000000..63487281f8e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460007.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460007" version="0" check="at least one" comment="portmap.sys (10.x) version is less than 10.0.14393.4350">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460015"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460008.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460008.xml
new file mode 100644
index 00000000000..3bc4521378b
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460008.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460008" version="0" check="at least one" comment="portmap.sys (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460016"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460009.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460009.xml
new file mode 100644
index 00000000000..d2ca58ad73a
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460009.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460009" version="0" check="at least one" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.17763.1879">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460017"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460010.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460010.xml
new file mode 100644
index 00000000000..e5384e10112
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460010.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460010" version="0" check="at least one" comment="portmap.sys (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460018"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460011.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460011.xml
new file mode 100644
index 00000000000..8f8d9b464ce
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460011.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460011" version="0" check="at least one" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.18362.1500">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460019"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460013.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460013.xml
new file mode 100644
index 00000000000..f365e670d3e
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460013.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460013" version="0" check="at least one" comment="portmap.sys (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460007"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460021"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460014.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460014.xml
new file mode 100644
index 00000000000..96615d011da
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460014.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460014" version="0" check="at least one" comment="portmap.sys (32-bit) (10.x) version is less than 10.0.19041.928">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460006"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460022"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460016.xml b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460016.xml
new file mode 100644
index 00000000000..a002bd62445
--- /dev/null
+++ b/repository/tests/windows/file_test/2021284460000/oval_com.jovalcm.ms.cve_tst_2021284460016.xml
@@ -0,0 +1,4 @@
+<file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021284460016" version="0" check="at least one" comment="portmap.sys (32-bit) (6.x) version is less than 6.0.6003.21091">
+  <object object_ref="oval:com.jovalcm.ms.cve:obj:2021284460005"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021284460024"/>
+</file_test>
\ No newline at end of file
diff --git a/repository/tests/windows/registry_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960004.xml b/repository/tests/windows/registry_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960004.xml
new file mode 100644
index 00000000000..6f8e080e74e
--- /dev/null
+++ b/repository/tests/windows/registry_test/2021270960000/oval_com.jovalcm.ms.cve_tst_2021270960004.xml
@@ -0,0 +1,4 @@
+<registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021270960004" version="0" check="all" comment="Current Windows revision number less than 18906">
+  <object object_ref="oval:org.cisecurity:obj:1575"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021270960006"/>
+</registry_test>
\ No newline at end of file
diff --git a/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470004.xml b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470004.xml
new file mode 100644
index 00000000000..b120846a686
--- /dev/null
+++ b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470004.xml
@@ -0,0 +1,4 @@
+<registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283470004" version="0" check="all" comment="Current Windows revision number less than 4350">
+  <object object_ref="oval:org.cisecurity:obj:1575"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283470004"/>
+</registry_test>
\ No newline at end of file
diff --git a/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470006.xml b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470006.xml
new file mode 100644
index 00000000000..ee39946e68a
--- /dev/null
+++ b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470006.xml
@@ -0,0 +1,4 @@
+<registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283470006" version="0" check="all" comment="Current Windows revision number less than 2145">
+  <object object_ref="oval:org.cisecurity:obj:1575"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283470006"/>
+</registry_test>
\ No newline at end of file
diff --git a/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470008.xml b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470008.xml
new file mode 100644
index 00000000000..e806ea28265
--- /dev/null
+++ b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470008.xml
@@ -0,0 +1,4 @@
+<registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283470008" version="0" check="all" comment="Current Windows revision number less than 1879">
+  <object object_ref="oval:org.cisecurity:obj:1575"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283470008"/>
+</registry_test>
\ No newline at end of file
diff --git a/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470010.xml b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470010.xml
new file mode 100644
index 00000000000..2c1b80704fd
--- /dev/null
+++ b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470010.xml
@@ -0,0 +1,4 @@
+<registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283470010" version="0" check="all" comment="Current Windows revision number less than 1500">
+  <object object_ref="oval:org.cisecurity:obj:1575"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283470010"/>
+</registry_test>
\ No newline at end of file
diff --git a/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470013.xml b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470013.xml
new file mode 100644
index 00000000000..936d2dff04f
--- /dev/null
+++ b/repository/tests/windows/registry_test/2021283470000/oval_com.jovalcm.ms.cve_tst_2021283470013.xml
@@ -0,0 +1,4 @@
+<registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" id="oval:com.jovalcm.ms.cve:tst:2021283470013" version="0" check="all" comment="Current Windows revision number less than 928">
+  <object object_ref="oval:org.cisecurity:obj:1575"/>
+  <state state_ref="oval:com.jovalcm.ms.cve:ste:2021283470013"/>
+</registry_test>
\ No newline at end of file