Add support for map param