Support for map argument added