Added map location and InfoWndow