Added AddressMap input type