Improved Leaflet module