refactored ParamsMap to generic.Map