Added support for selectively enable WVALUE, MVALUE, and WMVALUE options without editing headers