Follow change of SoapHelp names in lib. Use helpers insted of std::map ops where appropriate