Use map as optional param
Ammend docstring to match opts param change