AH-446_OptionsXML changed to std::map containers