added leaflet support