Refactor, no more generic paramter map.
Merge pull request #8 from thongsav-usgs/NAWQAAN-333

Refactor, no more generic paramter map.