Add support for Map Widget