Fixed support for Maps (Mapbox account)