Revert ware params to a std::map internal structure

(closes #164)