Separate Map and Marker Shortcodes / Marker Clustering

Thanks again for this great plugin.

Just wondering whether there is any way of using separate shortcodes for the map and markers? The Leaflet Map plugin for example uses the following:

[leaflet-map]
[leaflet-marker]

The reason for asking is because I would like to pull through the markers dynamically with a custom loop. Using the current shortcode setup within a loop would render multiple maps rather than a single map with multiple markers.

Hope that makes sense!

Also, is there an option to use marker clustering?

Many thanks