Improve integration of Leaflet integration