Changes for Leaflet