diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9c260740..9a11059a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,6 @@ on:
 
 env:
   PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
-  DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
 
 permissions:
   contents: write
@@ -58,17 +57,16 @@ jobs:
       run: |
         git config --global user.email "actions@github.com"
         git config --global user.name "GitHub Actions"
-      
-    - name: Un-SNAP root
-      run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-    
-    - name: Un-SNAP demo
-      run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-      working-directory: ${{ env.DEMO_MAVEN_MODULE }}
   
     - name: Un-SNAP 
-      run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: |
+        modules=("") # root
+        modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
+        for i in "${modules[@]}"
+        do
+            echo "Processing $i/pom.xml"
+            (cd "$i" && mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
+        done
   
     - name: Get version
       id: version
@@ -207,17 +205,16 @@ jobs:
         git config --global user.email "actions@github.com"
         git config --global user.name "GitHub Actions"
         git pull
-        
-    - name: Inc Version and SNAP root
-      run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-    
-    - name: Inc Version and SNAP demo
-      run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-      working-directory: ${{ env.DEMO_MAVEN_MODULE }}
-  
+
     - name: Inc Version and SNAP 
-      run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: |
+        modules=("") # root
+        modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
+        for i in "${modules[@]}"
+        do
+            echo "Processing $i/pom.xml"
+            (cd "$i" && mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
+        done
 
     - name: Git Commit and Push
       run: |
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index a255e875..bd37fc96 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -53,7 +53,12 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Build with Maven
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} -Dsonar.organization=${{ env.SONARCLOUD_ORG }} -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
+        run: |
+          mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+            -DskipTests \
+            -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
+            -Dsonar.organization=${{ env.SONARCLOUD_ORG }} \
+            -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 65b8cb49..19681faa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -90,5 +90,10 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfa931a6..3a4fa7c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 4.2.0
+* Fixed some invalid built JavaScript commands #330
+* Add basic support for CRS #333
+* Added a few new showcase demos
+* Updated dependencies
+
 ## 4.1.1
 * ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
 * Updated dependencies
diff --git a/pom.xml b/pom.xml
index 7abf80ca..15723b03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
diff --git a/vaadin-maps-leaflet-flow-demo/pom.xml b/vaadin-maps-leaflet-flow-demo/pom.xml
index 0df1492c..bf405302 100644
--- a/vaadin-maps-leaflet-flow-demo/pom.xml
+++ b/vaadin-maps-leaflet-flow-demo/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow-demo</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2019</inceptionYear>
@@ -26,9 +26,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.3.3</vaadin.version>
+		<vaadin.version>24.3.5</vaadin.version>
 
-		<org.springframework.boot.version>3.2.1</org.springframework.boot.version>
+		<org.springframework.boot.version>3.2.2</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>
@@ -191,7 +191,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.12.7</version>
+								<version>10.13.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/DemoView.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/DemoView.java
index 937b162f..51448d74 100644
--- a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/DemoView.java
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/DemoView.java
@@ -17,6 +17,8 @@
 import software.xdev.vaadin.maps.leaflet.flow.demo.FreeingUpResourceBenchmarkDemo;
 import software.xdev.vaadin.maps.leaflet.flow.demo.InitialResizeDemo;
 import software.xdev.vaadin.maps.leaflet.flow.demo.MinimalisticDemo;
+import software.xdev.vaadin.maps.leaflet.flow.demo.NotOfThisEarthDemo;
+import software.xdev.vaadin.maps.leaflet.flow.demo.WatermarkControlDemo;
 
 
 @PageTitle("Leaflet + Vaadin demos")
@@ -67,6 +69,16 @@ protected void onAttach(final AttachEvent attachEvent)
 				"Complex",
 				"A complex example with various leaflet components and methods"
 			),
+			new Example(
+				NotOfThisEarthDemo.NAV,
+				"Not of this earth",
+				"Displays a map that is not from this earth"
+			),
+			new Example(
+				WatermarkControlDemo.NAV,
+				"Watermark-Control",
+				"Creates a custom control interface"
+			),
 			new Example(
 				FreeingUpResourceBenchmarkDemo.NAV,
 				"Freeing up resources Benchmark",
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/NotOfThisEarthDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/NotOfThisEarthDemo.java
new file mode 100644
index 00000000..852535a8
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/NotOfThisEarthDemo.java
@@ -0,0 +1,86 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+import java.util.Map;
+
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.router.Route;
+
+import software.xdev.vaadin.maps.leaflet.MapContainer;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.crs.LCRS;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LImageOverlay;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LMarker;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LPolyline;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.map.LMapOptions;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+import software.xdev.vaadin.maps.leaflet.registry.LDefaultComponentManagementRegistry;
+
+
+@Route(NotOfThisEarthDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class NotOfThisEarthDemo extends AbstractDemo
+{
+	public static final String NAV = "not-of-this-earth";
+	
+	private final LComponentManagementRegistry reg;
+	
+	public NotOfThisEarthDemo()
+	{
+		// Let the view use 100% of the site
+		this.setSizeFull();
+		
+		this.add(new Anchor("https://leafletjs.com/examples/crs-simple/crs-simple.html", "Based on this example"));
+		
+		// Create the registry which is needed so that components can be reused and their methods invoked
+		// Note: You normally don't need to invoke any methods of the registry and just hand it over to the components
+		this.reg = new LDefaultComponentManagementRegistry(this);
+		
+		this.buildMap();
+	}
+	
+	private void buildMap()
+	{
+		// Create and add the MapContainer (which contains the map) to the UI
+		final MapContainer mapContainer = new MapContainer(
+			this.reg,
+			new LMapOptions()
+				.withCrs(LCRS.Defined.SIMPLE)
+				.withMinZoom(-3));
+		mapContainer.setSizeFull();
+		this.add(mapContainer);
+		
+		final LMap map = mapContainer.getlMap();
+		
+		new LImageOverlay(
+			this.reg,
+			"uqm_map_full.png",
+			new LLatLngBounds(
+				this.reg,
+				this.xy(-25, -26.5),
+				this.xy(1023, 1021.5))
+		).addTo(map);
+		
+		final LLatLng cordSol = this.xy(175.2, 145);
+		final LLatLng cordDeneb = this.xy(218.7, 8.3);
+		Map.ofEntries(
+			Map.entry(cordSol, "Sol"),
+			Map.entry(this.xy(41.6, 130.1), "Mizar"),
+			Map.entry(this.xy(13.4, 56.5), "Krueger-Z"),
+			Map.entry(cordDeneb, "Deneb")
+		).forEach((cords, text) -> new LMarker(this.reg, cords)
+			.bindPopup(text)
+			.addTo(map));
+		
+		new LPolyline(this.reg, cordSol, cordDeneb)
+			.addTo(map);
+		
+		map.setView(this.xy(300, 140), 1);
+	}
+	
+	private LLatLng xy(final double x, final double y)
+	{
+		return new LLatLng(this.reg, y, x);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/WatermarkControlDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/WatermarkControlDemo.java
new file mode 100644
index 00000000..97e21b47
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/WatermarkControlDemo.java
@@ -0,0 +1,142 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.router.Route;
+
+import software.xdev.vaadin.maps.leaflet.MapContainer;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.controls.LControl;
+import software.xdev.vaadin.maps.leaflet.controls.LControlOptions;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+import software.xdev.vaadin.maps.leaflet.registry.LDefaultComponentManagementRegistry;
+
+
+@Route(WatermarkControlDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class WatermarkControlDemo extends VerticalLayout
+{
+	public static final String NAV = "/watermark-control";
+	
+	@SuppressWarnings("checkstyle:LineLength")
+	public WatermarkControlDemo()
+	{
+		LWatermark.register();
+		
+		// Let the view use 100% of the site
+		this.setSizeFull();
+		
+		this.add(new Anchor(
+			"https://leafletjs.com/examples/extending/extending-3-controls.html#controls",
+			"Based on this example"));
+		
+		// Create the registry which is needed so that components can be reused and their methods invoked
+		// Note: You normally don't need to invoke any methods of the registry and just hand it over to the components
+		final LComponentManagementRegistry reg = new LDefaultComponentManagementRegistry(this);
+		
+		// Create and add the MapContainer (which contains the map) to the UI
+		final MapContainer mapContainer = new MapContainer(reg);
+		mapContainer.setSizeFull();
+		this.add(mapContainer);
+		
+		final LMap map = mapContainer.getlMap();
+		
+		// Add a (default) TileLayer so that we can see something on the map
+		map.addLayer(LTileLayer.createDefaultForOpenStreetMapTileServer(reg));
+		
+		new LWatermark(reg,
+			new LWatermarkOptions()
+				.withPosition(LControl.Positions.BOTTOM_LEFT)
+				.withWidth("20em")
+				.withSrc("""
+				data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="200" viewBox="0 0 18300 4500">
+				  <defs>
+				    <style>
+				      .fil0{fill:%23d71e23}
+				    </style>
+				  </defs>
+				  <g>
+				    <path class="fil0" d="M9763 10965h-920l-17-6-1503-588-1506 588-11 4-13 2-1562 148-1102 105 1064-369 2311-801-1638-633-683-263h1609l16 6 1515 588 1521-588 10-4 9-1 1388-211 1177-178-1131 441-2177 849 1675 647 682 264zM25514 9520l-1909 1442-22 17h-693l-23-19-1765-1440-285-233h907l22 17 1490 1178 1395-1177 23-19h1171zM20426 10961h-4015V9260h4126l-1 127-1 99v126h-112l-3041-3 2 322 3038 3h110l2 124 1 83 2 128h-3146v352l3035-6h112v346z" transform="translate(-5400 -7700)"/>
+				    <path class="fil0" d="M10994 9275h2026a12150 12150 0 0 1 1368 73c292 35 559 83 798 143h1c290 73 510 158 659 254 165 106 248 229 248 368 0 134-85 254-254 359-151 94-375 180-672 256-292 76-618 132-977 170-359 37-751 56-1174 56h-2102V9275h79zm917 1354h1106c300 0 574-14 822-41 247-27 469-67 665-121h1a2470 2470 0 0 0 277-96c176-79 264-164 264-256 0-60-39-118-117-173-92-66-234-125-425-178-197-55-418-96-665-123-248-27-522-41-822-41h-1106v1029z" transform="translate(-5400 -7700)"/>
+				  </g>
+				</svg>
+				"""))
+			.addTo(map);
+		
+		// Set what part of the world should be shown
+		map.setView(new LLatLng(reg, 49.6751, 12.1607), 5);
+	}
+	
+	public static class LWatermark extends LControl<LWatermark>
+	{
+		public LWatermark(
+			final LComponentManagementRegistry compReg,
+			final LWatermarkOptions options)
+		{
+			super(compReg, "L.control.watermark(" + compReg.writeOptions(options) + ")");
+		}
+		
+		public static void register()
+		{
+			UI.getCurrent().getPage().executeJs("""
+				L.Control.Watermark = L.Control.extend({
+				    onAdd: function(map) {
+				        var img = L.DomUtil.create('img');
+				        img.src = this.options.src;
+				        img.style.width = this.options.width;
+				        return img;
+				    },
+				    
+				    onRemove: function(map) {
+				        // Nothing to do here
+				    }
+				});
+				
+				L.control.watermark = function(opts) {
+				    return new L.Control.Watermark(opts);
+				}
+				""");
+		}
+	}
+	
+	public static class LWatermarkOptions extends LControlOptions<LWatermarkOptions>
+	{
+		private String src;
+		private String width;
+		
+		public String getSrc()
+		{
+			return this.src;
+		}
+		
+		public void setSrc(final String src)
+		{
+			this.src = src;
+		}
+		
+		public LWatermarkOptions withSrc(final String src)
+		{
+			this.setSrc(src);
+			return this.self();
+		}
+		
+		public String getWidth()
+		{
+			return this.width;
+		}
+		
+		public void setWidth(final String width)
+		{
+			this.width = width;
+		}
+		
+		public LWatermarkOptions withWidth(final String width)
+		{
+			this.setWidth(width);
+			return this.self();
+		}
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/resources/META-INF/resources/uqm_map_full.png b/vaadin-maps-leaflet-flow-demo/src/main/resources/META-INF/resources/uqm_map_full.png
new file mode 100644
index 00000000..bfb4d4e0
Binary files /dev/null and b/vaadin-maps-leaflet-flow-demo/src/main/resources/META-INF/resources/uqm_map_full.png differ
diff --git a/vaadin-maps-leaflet-flow/pom.xml b/vaadin-maps-leaflet-flow/pom.xml
index 4231f736..312951c4 100644
--- a/vaadin-maps-leaflet-flow/pom.xml
+++ b/vaadin-maps-leaflet-flow/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>LeafletMap for Vaadin</name>
@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.3.3</vaadin.version>
+		<vaadin.version>24.3.5</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -296,7 +296,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.12.7</version>
+								<version>10.13.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/MapContainer.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/MapContainer.java
index 8339256c..6ddfceaa 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/MapContainer.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/MapContainer.java
@@ -31,6 +31,7 @@
 
 import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
 import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.map.LMapOptions;
 import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
 
 
@@ -49,7 +50,29 @@ public class MapContainer extends Composite<Div> implements HasSize, HasStyle, H
 	
 	public MapContainer(final LComponentManagementRegistry reg)
 	{
-		this(reg, null);
+		this(reg, (LMapOptions)null);
+	}
+	
+	public MapContainer(
+		final LComponentManagementRegistry reg,
+		final LMapOptions options)
+	{
+		this(reg, options, null);
+	}
+	
+	/**
+	 * @param afterInitialResize This is called after the map was initially resized/is ready.
+	 *                           <p/>
+	 *                           This is ONLY required when calling certain methods like e.g.
+	 *                           {@link LMap#fitBounds(LLatLngBounds)} instantly after the map is created.
+	 *                           <p/>
+	 *                           For performance reasons it's highly recommended to only use this when required.
+	 */
+	public MapContainer(
+		final LComponentManagementRegistry reg,
+		final Consumer<LMap> afterInitialResize)
+	{
+		this(reg, null, afterInitialResize);
 	}
 	
 	/**
@@ -62,13 +85,14 @@ public MapContainer(final LComponentManagementRegistry reg)
 	 */
 	public MapContainer(
 		final LComponentManagementRegistry reg,
+		final LMapOptions options,
 		final Consumer<LMap> afterInitialResize)
 	{
 		this.afterInitialResize = afterInitialResize;
 		this.getContent().setSizeFull();
 		this.fixZIndex();
 		
-		this.lMap = new LMap(reg, this.getContent());
+		this.lMap = new LMap(reg, this.getContent(), options);
 		this.fixInitialSizeAfterCreation();
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LEvented.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LEvented.java
index 54b0583a..dd156a03 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LEvented.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LEvented.java
@@ -16,6 +16,9 @@
 package software.xdev.vaadin.maps.leaflet.base;
 
 /**
+ * @apiNote
+ * Data integrity when retrieving client side data can't be assured.
+ * Use at your own risk!
  * @see <a href="https://leafletjs.com/reference.html#evented">Leaflet docs</a>
  */
 public interface LEvented<S extends LEvented<S>> extends LComponent<S>
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControl.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControl.java
index 3e06fc58..128b099e 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControl.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControl.java
@@ -52,4 +52,21 @@ public S addTo(final LMap map)
 		this.invokeSelf(".addTo(" + map.clientComponentJsAccessor() + ")");
 		return this.self();
 	}
+	
+	/**
+	 * The possible values of position
+	 *
+	 * @see <a href="https://leafletjs.com/reference.html#control-position">Leaflet docs</a>
+	 */
+	public static final class Positions
+	{
+		public static final String TOP_LEFT = "topleft";
+		public static final String TOP_RIGHT = "topright";
+		public static final String BOTTOM_LEFT = "bottomleft";
+		public static final String BOTTOM_RIGHT = "bottomright";
+		
+		private Positions()
+		{
+		}
+	}
 }
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayers.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayers.java
index 6d303cc8..cea1c9c5 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayers.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayers.java
@@ -36,9 +36,9 @@ public LControlLayers(
 		final LControlLayersOptions options)
 	{
 		super(compReg, "L.control.layers("
-			+ (baselayers != null ? convertLayerMapToString(baselayers) : "")
+			+ (baselayers != null ? convertLayerMapToString(baselayers) : "{}")
 			+ "," + (overlays != null ? convertLayerMapToString(overlays) : "{}")
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/crs/LCRS.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/crs/LCRS.java
new file mode 100644
index 00000000..57d1d372
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/crs/LCRS.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2019 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.vaadin.maps.leaflet.crs;
+
+import software.xdev.vaadin.maps.leaflet.base.RawString;
+
+
+/**
+ * @apiNote CRS can't be constructed
+ * @see <a href="https://leafletjs.com/reference.html#crs">Leaflet docs</a>
+ */
+public final class LCRS
+{
+	public static final class Defined
+	{
+		public static final RawString EARTH = new RawString("L.CRS.Earth");
+		
+		public static final RawString EPSG3395 = new RawString("L.CRS.EPSG3395");
+		public static final RawString EPSG3857 = new RawString("L.CRS.EPSG3857");
+		public static final RawString EPSG4326 = new RawString("L.CRS.EPSG4326");
+		public static final RawString BASE = new RawString("L.CRS.Base");
+		public static final RawString SIMPLE = new RawString("L.CRS.Simple");
+		
+		private Defined()
+		{
+		}
+	}
+	
+	private LCRS()
+	{
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayer.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayer.java
index a0e14df1..84f62493 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayer.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayer.java
@@ -112,7 +112,7 @@ public S removeFrom(final LLayerGroup layerGroup)
 	public S bindPopup(final String content, final LPopupOptions options)
 	{
 		this.invokeSelf(
-			".bindPopup($0, " + this.componentRegistry().writeOptionsOptionalParameter(options) + ")",
+			".bindPopup($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",
 			content);
 		return this.self();
 	}
@@ -187,7 +187,7 @@ public S closePopup()
 	public S bindTooltip(final String content, final LTooltipOptions options)
 	{
 		this.invokeSelf(
-			".bindTooltip($0, " + this.componentRegistry().writeOptionsOptionalParameter(options) + ")",
+			".bindTooltip($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",
 			content);
 		return this.self();
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlay.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlay.java
index 30e10688..ceeb1a6f 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlay.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlay.java
@@ -44,10 +44,11 @@ public LImageOverlay(
 		final LLatLngBounds bounds,
 		final LImageOverlayOptions options)
 	{
-		super(compReg,
+		super(
+			compReg,
 			"L.imageOverlay($0, "
-			+ bounds.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options) + ")",
+				+ bounds.clientComponentJsAccessor()
+				+ compReg.writeOptionsOptionalNextParameter(options) + ")",
 			imageUrl);
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayer.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayer.java
index fc65ac79..0dcb8300 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayer.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayer.java
@@ -44,7 +44,7 @@ public LTileLayer(
 		final String urlTemplate,
 		final LTileLayerOptions options)
 	{
-		super(compReg, "L.tileLayer($0" + compReg.writeOptionsOptionalParameter(options) + ")", urlTemplate);
+		super(compReg, "L.tileLayer($0" + compReg.writeOptionsOptionalNextParameter(options) + ")", urlTemplate);
 	}
 	
 	public LTileLayer(
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlay.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlay.java
index d63ea38a..d4182c51 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlay.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlay.java
@@ -33,7 +33,7 @@ public LVideoOverlay(
 		super(compReg,
 			"L.videoOverlay($0, "
 				+ bounds.clientComponentJsAccessor()
-				+ compReg.writeOptionsOptionalParameter(options)
+				+ compReg.writeOptionsOptionalNextParameter(options)
 				+ ")",
 			video);
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarker.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarker.java
index 21f16387..ef6e972b 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarker.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarker.java
@@ -45,7 +45,7 @@ public LMarker(
 			compReg,
 			"L.marker("
 				+ compReg.clientComponentJsAccessor(latLng)
-				+ compReg.writeOptionsOptionalParameter(options)
+				+ compReg.writeOptionsOptionalNextParameter(options)
 				+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopup.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopup.java
index fce72413..de041f63 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopup.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopup.java
@@ -52,7 +52,7 @@ public LPopup(
 	{
 		super(compReg, "L.popup("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltip.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltip.java
index 0821f053..c325f021 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltip.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltip.java
@@ -52,7 +52,7 @@ public LTooltip(
 	{
 		super(compReg, "L.tooltip("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircle.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircle.java
index 0a6cf896..1a55c0fb 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircle.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircle.java
@@ -31,7 +31,7 @@ public LCircle(
 	{
 		super(compReg, "L.circle("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarker.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarker.java
index 5de8fc71..18bb5055 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarker.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarker.java
@@ -31,7 +31,7 @@ public LCircleMarker(
 	{
 		super(compReg, "L.circleMarker("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolyline.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolyline.java
index 92fc8633..23b0f76a 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolyline.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolyline.java
@@ -45,7 +45,7 @@ protected LPolyline(
 	{
 		super(compReg, constructorMethod + "("
 			+ convertMultiLatLngs(latLngs)
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LRectangle.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LRectangle.java
index 1d28bae5..0e8de935 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LRectangle.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LRectangle.java
@@ -31,7 +31,7 @@ public LRectangle(
 	{
 		super(compReg, "L.rectangle("
 			+ bounds.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlay.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlay.java
index 2f863052..804f83db 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlay.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlay.java
@@ -35,7 +35,7 @@ public LSVGOverlay(
 		super(compReg,
 			"L.svgOverlay($0, "
 				+ bounds.clientComponentJsAccessor()
-				+ compReg.writeOptionsOptionalParameter(options)
+				+ compReg.writeOptionsOptionalNextParameter(options)
 				+ ")",
 			svg);
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMap.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMap.java
index dd6cff8c..cda90aee 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMap.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMap.java
@@ -49,7 +49,7 @@ public LMap(
 		final String id,
 		final LMapOptions options)
 	{
-		super(compReg, "L.map($0" + compReg.writeOptionsOptionalParameter(options) + ")", id);
+		super(compReg, "L.map($0" + compReg.writeOptionsOptionalNextParameter(options) + ")", id);
 	}
 	
 	public LMap(
@@ -197,7 +197,7 @@ public LMap setView(final LLatLng center, final int zoom, final LMapZoomPanOptio
 		this.invokeSelf(".setView("
 			+ center.clientComponentJsAccessor()
 			+ "," + zoom
-			+ this.componentRegistry().writeOptionsOptionalParameter(options)
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 			+ ")");
 		return this.self();
 	}
@@ -217,7 +217,7 @@ public LMap zoomIn(final Integer delta, final LMapZoomOptions options)
 	{
 		this.invokeSelf(".zoomIn("
 			+ (delta != null ? delta : "")
-			+ this.componentRegistry().writeOptionsOptionalParameter(options)
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 			+ ")");
 		return this.self();
 	}
@@ -245,7 +245,7 @@ public LMap zoomOut(final Integer delta, final LMapZoomOptions options)
 	{
 		this.invokeSelf(".zoomOut("
 			+ (delta != null ? delta : "")
-			+ this.componentRegistry().writeOptionsOptionalParameter(options)
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 			+ ")");
 		return this.self();
 	}
@@ -275,7 +275,7 @@ public LMap setZoomAround(final LLatLng latLng, final int zoom, final LMapZoomOp
 			".setZoomAround("
 				+ latLng.clientComponentJsAccessor()
 				+ ",$0"
-				+ this.componentRegistry().writeOptionsOptionalParameter(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")",
 			zoom);
 		return this.self();
@@ -298,7 +298,7 @@ public LMap setZoomAround(final LPoint point, final int zoom, final LMapZoomOpti
 			".setZoomAround("
 				+ point.clientComponentJsAccessor()
 				+ ",$0"
-				+ this.componentRegistry().writeOptionsOptionalParameter(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")",
 			zoom);
 		return this.self();
@@ -320,7 +320,7 @@ public LMap fitBounds(final LLatLngBounds bounds, final LMapFitBoundOptions opti
 		this.invokeSelf(
 			".fitBounds("
 				+ bounds.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptionsOptionalParameter(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -404,7 +404,7 @@ public LMap flyTo(final LLatLng latLng, final Integer zoom, final LMapZoomPanOpt
 			".flyTo("
 				+ latLng.clientComponentJsAccessor()
 				+ (zoom != null ? "," + zoom : "")
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -433,7 +433,7 @@ public LMap flyToBounds(final LLatLngBounds bounds, final LMapZoomPanOptions opt
 		this.invokeSelf(
 			".flyToBounds("
 				+ bounds.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -484,7 +484,7 @@ public LMap panInsideBounds(final LLatLngBounds bounds, final LMapPanOptions opt
 		this.invokeSelf(
 			".panInsideBounds("
 				+ bounds.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -505,7 +505,7 @@ public LMap panInside(final LLatLng latLng, final LMapPanOptions options)
 		this.invokeSelf(
 			".panInside("
 				+ latLng.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapOptions.java
index 1d7614bf..f80983e9 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapOptions.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapOptions.java
@@ -59,7 +59,8 @@ public class LMapOptions implements LComponentOptions<LMapOptions>
 	// Boolean|String
 	private Object touchZoom;
 	private Boolean bounceAtZoomLimits;
-	// CRS is currently not implemented - the default used one should be sufficient
+	
+	private Object crs;
 	private LLatLng center;
 	private Integer zoom;
 	private Integer minZoom;
@@ -473,6 +474,22 @@ public LMapOptions withBounceAtZoomLimits(final Boolean bounceAtZoomLimits)
 		return this.self();
 	}
 	
+	public Object getCrs()
+	{
+		return this.crs;
+	}
+	
+	public void setCrs(final Object crs)
+	{
+		this.crs = crs;
+	}
+	
+	public LMapOptions withCrs(final Object crs)
+	{
+		this.setCrs(crs);
+		return this.self();
+	}
+	
 	public LLatLng getCenter()
 	{
 		return this.center;
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LComponentManagementRegistry.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LComponentManagementRegistry.java
index a69d5e0e..3070df03 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LComponentManagementRegistry.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LComponentManagementRegistry.java
@@ -36,7 +36,7 @@
 public interface LComponentManagementRegistry
 {
 	// region Write Options
-	String writeOptionsOptionalParameter(final LComponentOptions<?> options);
+	String writeOptionsOptionalNextParameter(final LComponentOptions<?> options);
 	
 	String writeOptions(final LComponentOptions<?> options);
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
index 49d7f63f..ab9d464e 100644
--- a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
@@ -76,7 +76,7 @@ public LDefaultComponentManagementRegistry(final HasComponents parent, final Obj
 	}
 	
 	@Override
-	public String writeOptionsOptionalParameter(final LComponentOptions<?> options)
+	public String writeOptionsOptionalNextParameter(final LComponentOptions<?> options)
 	{
 		return options == null ? "" : (", " + this.writeOptionsOrEmptyObject(options));
 	}