diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..9bd656c3
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: Leaflet
+open_collective: leafletjs
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 68299d5d..f8924957 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -14,9 +14,9 @@ body:
     attributes:
       label: "Checklist"
       options:
-        - label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
+        - label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/vaadin-maps-leaflet-flow/releases/latest)"
           required: true
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues) or [closed](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
           required: true
         - label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
           required: true
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 75231293..0a195641 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: "Checklist"
       options:
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues) or [closed](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
           required: true
         - label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
           required: true
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index 6ecd6ad5..be35f000 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: "Checklist"
       options:
-        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
+        - label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues) or [closed](https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
           required: true
         - label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
           required: true
diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
new file mode 100644
index 00000000..67541dfe
--- /dev/null
+++ b/.github/workflows/no-response.yml
@@ -0,0 +1,26 @@
+name: No Response
+
+on:
+  workflow_dispatch:
+  issue_comment:
+    types: [created]
+  schedule:
+    - cron: '5 5 * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          days-before-issue-stale: 7
+          days-before-issue-close: 3
+          stale-issue-label: "stale"
+          only-labels: "waiting-for-response"
+          labels-to-remove-when-unstale: "waiting-for-response"
+          stale-issue-message: "This issue will be closed soon because there has been no further activity."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml
index 30917454..35fc9a23 100644
--- a/.run/Run Demo.run.xml	
+++ b/.run/Run Demo.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.vaadin.Application" />
-    <module name="template-placeholder-demo" />
+    <module name="vaadin-maps-leaflet-flow-demo" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29b..c676766e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,89 @@
+## 4.3.0
+* Updated to Vaadin 24.4
+* Deduplicated ``tLMapZoomPanOptions``
+
+## 4.2.1
+* Handle ``LEvented#off`` in the same way as ``LEvented#on``
+  * Fix incorrect formatting leading to JS error
+* Updated dependencies
+
+## 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
+
+## 4.1.0
+* Provide a workaround that fixes a problem where certain methods didn't work instantly after the map was created #305
+* Moved some container specific methods to ``MapContainer``
+
+## 4.0.1
+* Added shortcut method ``invokeSelfReturn`` #282
+* Updated dependencies
+
+## 4.0.0
+⚠️<i>This release contains breaking changes</i>
+
+* The complete API got reworked and now has the [same structure as Leaflet](https://leafletjs.com/reference.html).
+* Added lots of new Leaflet APIs - currently around 90% of the Leaflet API are implemented. These include the most useful bits:
+  * GeoLocation
+  * A lot of new methods for Map
+  * Tooltips & Popups
+  * Image, Video and SVG-Overlays
+  * Rectangles
+  * Controls for Scale, Layers, ...
+  * and much more
+* Abstracted the elements similar to how this is done inside Leaflet itself so that they can easily be extended
+* The API only supports sending instructions to the client. Retrieving client side data is not supported as data integrity can't be guaranteed (client-side data can be modified by users).
+  * Event listeners can still be registered but this needs to be done manually. A example is available in the demo.
+* All Leaflet elements are now tracked on the client and on the server and can therefore be modified/reused (using ``LComponentManagementRegistry``).
+  * Before it was only possible to create an element and then send it to the client
+  * However keep in mind when creating a lot of elements that you may have to free up memory on the client (manually)
+* Integrated default Leaflet resources
+
+## 3.0.2
+* Added support for Polyline #266 (thanks to @blitzdose)
+
+## 3.0.1
+* Fixed ``divIcon`` being displayed incorrectly [due to a default ``iconSize`` of ``12px``](https://github.com/Leaflet/Leaflet/issues/4238) #246
+* Updated dependencies
+  * Updated leaflet to [``1.9.4``](https://github.com/Leaflet/Leaflet/blob/b6b56f6e707142c177fad2f67827a5007e56736a/CHANGELOG.md#194-2023-05-18) #247
+
+## 3.0.0
+⚠️<i>This release contains breaking changes</i>
+
+* Adds support for Vaadin 24+, drops support for Vaadin 23<br/>
+  <i>If you are still using Vaadin 23, use the ``2.x`` versions.</i>
+  * Requires Java 17+
+
+## 2.0.4
+* Added method ``centerAndZoom`` in ``LMap``
+* Fixed a problem where an invalid ``iconSize`` was transferred to leaflet which caused a client side exception (#199)
+* Updated various dependencies
+
+## 2.0.3
+* Updated dependencies
+* Fixed problem with setting lon/lan in LMarker
+* Added constructors for LMap
+
+## 2.0.2
+* Updated dependencies
+
+## 2.0.1
+* Updated dependencies
+  * Vaadin 23.2
+
+## 2.0.0
+⚠️<i>This release contains breaking changes</i>
+
+* Update to Vaadin 23
+  * Removed deprecated polymer-connector - replaced by ``executeJs``
+* Fixed a problem where the map was not rendered/aligned correctly
+* Don't load anything from remote servers that are not under control of the user
+* Shrunk the jar
+* Removed default leafletmap tile layer; has to be set manually due to usage policy
+* Updated dependency versions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 40413157..87ccb356 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,10 +47,10 @@ Bigger changes may require a complete restart.
   * [Vaadin automatically reloads the UI on each restart](https://vaadin.com/docs/latest/configuration/live-reload/spring-boot).<br/>
   You can control this behavior with the ``vaadin.devmode.liveReload.enabled`` property (default: ``true``).
 
-## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/actions/workflows/release.yml)
+## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-maps-leaflet-flow/release.yml?branch=master)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/release.yml)
 
 Before releasing:
-* Consider doing a [test-deployment](https://github.com/xdev-software/template-placeholder/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+* Consider doing a [test-deployment](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
 * Check the [changelog](CHANGELOG.md)
 
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
diff --git a/README.md b/README.md
index a8a96c6d..42718a3c 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,36 @@
-[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/template-placeholder)
-[![Latest version](https://img.shields.io/maven-central/v/software.xdev/template-placeholder?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/template-placeholder)
-[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/check-build.yml?branch=develop)](https://github.com/xdev-software/template-placeholder/actions/workflows/check-build.yml?query=branch%3Adevelop)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_template-placeholder&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_template-placeholder)
+[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/leafletmap-for-vaadin)
+[![Latest version](https://img.shields.io/maven-central/v/software.xdev/vaadin-maps-leaflet-flow?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/vaadin-maps-leaflet-flow)
+[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-maps-leaflet-flow/check-build.yml?branch=develop)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/check-build.yml?query=branch%3Adevelop)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-maps-leaflet-flow&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-maps-leaflet-flow)
 ![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0)
 
-# template-placeholder
-A Vaadin Template Repo
+# vaadin-maps-leaflet-flow
+A Vaadin Flow Java API for [Leaflet](https://leafletjs.com/)
 
 ![demo](assets/demo.png)
 
+## Usage
+
+This API wraps the Leaflet API in a Vaadin friendly way.<br/>It uses a similar structure (classes, methods) as the [Leaflet JavaScript API](https://leafletjs.com/reference.html).
+
+To get started it's recommended to have a look at the [demo](./vaadin-maps-leaflet-flow-demo), notably the [minimalistic example](./vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/MinimalisticDemo.java).
+
+> [!NOTE]
+> **The API only supports sending instructions to the client**<br/>
+> Due to data integrity retrieving client-side data (that can be modified by users) is not supported.
+> * Event listeners can still be registered but this needs to be done manually.<br/>[An example is available in the demo](./vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/EventDemo.java).
 
 ## Installation
-[Installation guide for the latest release](https://github.com/xdev-software/template-placeholder/releases/latest#Installation)
+[Installation guide of the latest release](https://github.com/xdev-software/vaadin-maps-leaflet-flow/releases/latest#Installation)
+
+#### Compatibility with Vaadin
+| Vaadin version | vaadin-maps-leaflet-flow version |
+| --- | --- |
+| Vaadin 24+ (latest) | ``3+`` |
 
 ## Run the Demo
 * Checkout the repo
-* Run ``mvn install && mvn -f template-placeholder-demo spring-boot:run``
+* Run ``mvn install && mvn -f vaadin-maps-leaflet-flow-demo spring-boot:run``
 * Open http://localhost:8080
 
 <details>
@@ -31,4 +46,4 @@ If you need support as soon as possible and you can't wait for any pull request,
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/template-placeholder/dependencies)
+View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/vaadin-maps-leaflet-flow/dependencies)
diff --git a/SECURITY.md b/SECURITY.md
index 34b9514d..fbbe0ff2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,4 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/template-placeholder/security/advisories/new).
+Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/vaadin-maps-leaflet-flow/security/advisories/new).
diff --git a/assets/demo.avif b/assets/demo.avif
index c12da7e6..2e4eeb28 100644
Binary files a/assets/demo.avif and b/assets/demo.avif differ
diff --git a/assets/demo.png b/assets/demo.png
index a5d9bad4..2791fa23 100644
Binary files a/assets/demo.png and b/assets/demo.png differ
diff --git a/pom.xml b/pom.xml
index 421afd41..6d24ed4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>template-placeholder-root</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
+	<version>4.3.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -15,8 +15,8 @@
 	</organization>
 
 	<modules>
-		<module>template-placeholder</module>
-		<module>template-placeholder-demo</module>
+		<module>vaadin-maps-leaflet-flow</module>
+		<module>vaadin-maps-leaflet-flow-demo</module>
 	</modules>
 
 	<properties>
diff --git a/renovate.json5 b/renovate.json5
index 2874d457..068c28f0 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -4,7 +4,7 @@
   "packageRules": [
     {
       "description": "Ignore project internal dependencies",
-      "packagePattern": "^software.xdev:template-placeholder",
+      "packagePattern": "^software.xdev:vaadin-maps-leaflet-flow",
       "datasources": [
         "maven"
       ],
diff --git a/template-placeholder-demo/pom.xml b/vaadin-maps-leaflet-flow-demo/pom.xml
similarity index 95%
rename from template-placeholder-demo/pom.xml
rename to vaadin-maps-leaflet-flow-demo/pom.xml
index f9b5e763..a513159b 100644
--- a/template-placeholder-demo/pom.xml
+++ b/vaadin-maps-leaflet-flow-demo/pom.xml
@@ -6,12 +6,12 @@
 
 	<parent>
 		<groupId>software.xdev</groupId>
-		<artifactId>template-placeholder-root</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
+		<version>4.3.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>template-placeholder-demo</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>vaadin-maps-leaflet-flow-demo</artifactId>
+	<version>4.3.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -64,7 +64,7 @@
 		</dependency>
 		<dependency>
 			<groupId>software.xdev</groupId>
-			<artifactId>template-placeholder</artifactId>
+			<artifactId>vaadin-maps-leaflet-flow</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/template-placeholder-demo/src/main/java/software/xdev/vaadin/Application.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/Application.java
similarity index 100%
rename from template-placeholder-demo/src/main/java/software/xdev/vaadin/Application.java
rename to vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/Application.java
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
new file mode 100644
index 00000000..18f86330
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/DemoView.java
@@ -0,0 +1,107 @@
+package software.xdev.vaadin.maps.leaflet.flow;
+
+import java.util.List;
+
+import com.vaadin.flow.component.AttachEvent;
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.component.grid.GridVariant;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.data.renderer.ComponentRenderer;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+
+import software.xdev.vaadin.maps.leaflet.flow.demo.ComplexDemo;
+import software.xdev.vaadin.maps.leaflet.flow.demo.EventDemo;
+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.MultiLayerWithPyramidDemo;
+import software.xdev.vaadin.maps.leaflet.flow.demo.NotOfThisEarthDemo;
+import software.xdev.vaadin.maps.leaflet.flow.demo.WatermarkControlDemo;
+
+
+@PageTitle("Leaflet + Vaadin demos")
+@Route("")
+public class DemoView extends Composite<VerticalLayout>
+{
+	private final Grid<Example> grExamples = new Grid<>();
+	
+	public DemoView()
+	{
+		this.grExamples
+			.addColumn(new ComponentRenderer<>(example -> {
+				final Anchor anchor = new Anchor(example.route(), example.name());
+				
+				final Span spDesc = new Span(example.desc());
+				spDesc.getStyle().set("font-size", "90%");
+				spDesc.getStyle().set("white-space", "pre");
+				
+				final VerticalLayout vl = new VerticalLayout(anchor, spDesc);
+				vl.setSpacing(false);
+				return vl;
+			}))
+			.setHeader("Available demos");
+		
+		this.grExamples.setSizeFull();
+		this.grExamples.addThemeVariants(GridVariant.LUMO_COMPACT, GridVariant.LUMO_NO_BORDER);
+		
+		this.getContent().add(this.grExamples);
+		this.getContent().setHeightFull();
+	}
+	
+	@Override
+	protected void onAttach(final AttachEvent attachEvent)
+	{
+		this.grExamples.setItems(List.of(
+			new Example(
+				MinimalisticDemo.NAV,
+				"Minimalistic",
+				"Showcasing the simplest form of using the API"
+			),
+			new Example(
+				InitialResizeDemo.NAV,
+				"Initial resize",
+				"Some map methods - when called instantly after the map is created - will not work correctly."
+					+ " This example shows how to workaround this restriction."
+			),
+			new Example(
+				ComplexDemo.NAV,
+				"Complex",
+				"A complex example with various leaflet components and methods"
+			),
+			new Example(
+				EventDemo.NAV,
+				"Event",
+				"A showcase how events can work"
+			),
+			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(
+				MultiLayerWithPyramidDemo.NAV,
+				"Multi-Layer",
+				"using Pyramids ▲ and more...\n"
+					+ "Showcases a selection of different layers and how they can be displayed on a map"
+			),
+			new Example(
+				FreeingUpResourceBenchmarkDemo.NAV,
+				"Freeing up resources Benchmark",
+				"Benchmark for showcasing how resources a freed up when handling huge amounts of components"
+			)
+		));
+	}
+	
+	record Example(String route, String name, String desc)
+	{
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/AbstractDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/AbstractDemo.java
new file mode 100644
index 00000000..1cf77639
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/AbstractDemo.java
@@ -0,0 +1,33 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+
+
+public abstract class AbstractDemo extends VerticalLayout
+{
+	protected Button createToggleButton(
+		final String showText,
+		final String hideText,
+		final Runnable onShow,
+		final Runnable onHide)
+	{
+		final AtomicBoolean shown = new AtomicBoolean(false);
+		final Button btn = new Button(
+			showText,
+			ev -> {
+				final boolean isShow = !shown.get();
+				(isShow ? onShow : onHide).run();
+				ev.getSource().setText(isShow ? hideText : showText);
+				
+				shown.set(isShow);
+				
+				ev.getSource().setEnabled(true);
+			}
+		);
+		btn.setDisableOnClick(true);
+		return btn;
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java
new file mode 100644
index 00000000..586993af
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java
@@ -0,0 +1,398 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.flow.component.ClientCallable;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.dialog.Dialog;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.router.Route;
+
+import elemental.json.JsonObject;
+import elemental.json.JsonValue;
+import software.xdev.vaadin.maps.leaflet.MapContainer;
+import software.xdev.vaadin.maps.leaflet.basictypes.LDivIcon;
+import software.xdev.vaadin.maps.leaflet.basictypes.LDivIconOptions;
+import software.xdev.vaadin.maps.leaflet.basictypes.LIcon;
+import software.xdev.vaadin.maps.leaflet.basictypes.LIconOptions;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.basictypes.LPoint;
+import software.xdev.vaadin.maps.leaflet.controls.LControlLayers;
+import software.xdev.vaadin.maps.leaflet.controls.LControlLayersOptions;
+import software.xdev.vaadin.maps.leaflet.controls.LControlScale;
+import software.xdev.vaadin.maps.leaflet.controls.LControlScaleOptions;
+import software.xdev.vaadin.maps.leaflet.layer.LLayer;
+import software.xdev.vaadin.maps.leaflet.layer.LLayerGroup;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LImageOverlay;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LVideoOverlay;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LVideoOverlayOptions;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LMarker;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LMarkerOptions;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LCircle;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LCircleOptions;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LPolygon;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LPolyline;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.map.LMapLocateOptions;
+import software.xdev.vaadin.maps.leaflet.registry.LDefaultComponentManagementRegistry;
+
+
+@Route(ComplexDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class ComplexDemo extends AbstractDemo
+{
+	public static final String NAV = "/complex";
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ComplexDemo.class);
+	private static final String ID = "leaflet-demo-view";
+	
+	private final LDefaultComponentManagementRegistry reg;
+	private final LMap map;
+	private final HorizontalLayout hlButtons = new HorizontalLayout();
+	
+	public ComplexDemo()
+	{
+		this.setId(ID);
+		
+		this.reg = new LDefaultComponentManagementRegistry(this);
+		
+		final MapContainer mapContainer = new MapContainer(this.reg);
+		mapContainer.setSizeFull();
+		this.add(mapContainer);
+		this.setSizeFull();
+		
+		this.map = mapContainer.getlMap();
+		
+		final LLatLng center = new LLatLng(this.reg, 49.675126, 12.160733);
+		this.map.setView(center, 17);
+		
+		final LTileLayer tlOSM = LTileLayer.createDefaultForOpenStreetMapTileServer(this.reg);
+		final LTileLayer tlOSMHOT = new LTileLayer(
+			this.reg,
+			"https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png'",
+			19,
+			"&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors, Tiles style by"
+				+ " <a href=\"https://www.hotosm.org/\" target=\"_blank\">Humanitarian OpenStreetMap Team</a> hosted "
+				+ "by <a href=\"https://openstreetmap.fr/\" target=\"_blank\">OpenStreetMap France</a>"
+		);
+		final LTileLayer tlTopo = new LTileLayer(
+			this.reg,
+			"https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png",
+			16,
+			"Map data: &copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors, <a "
+				+ "href=\"http://viewfinderpanoramas.org\">SRTM</a> | Map style: &copy; <a href=\"https://opentopomap"
+				+ ".org\">OpenTopoMap</a> (<a href=\"https://creativecommons.org/licenses/by-sa/3.0/\">CC-BY-SA</a>"
+		);
+		
+		final LDivIcon divIconInfo = new LDivIcon(this.reg, new LDivIconOptions()
+			.withHtml("""
+				<div style="white-space:nowrap; padding: 0.5em">
+				<center><b>Welcome to Weiden in der Oberpfalz!</b></center>
+				This demo shows you different markers,<br> popups, polygons and other stuff
+				</div>
+				""")
+			// Set the icon size to unlimited otherwise the div collapses
+			.withIconSize(new LPoint(this.reg, -1, -1)));
+		final LMarker markerInfo = new LMarker(
+			this.reg,
+			new LLatLng(this.reg, 49.674662, 12.162869),
+			new LMarkerOptions().withIcon(divIconInfo));
+		
+		@SuppressWarnings("checkstyle:LineLength")
+		final LIcon iconXDEV = new LIcon(this.reg, new LIconOptions()
+			.withIconUrl("""
+				data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="200" viewBox="0 0 18300 4500" style="background-color:rgba(180,180,180,0.7)">
+				  <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>
+				""")
+			.withIconSize(new LPoint(this.reg, 125, 25)));
+		
+		final LLatLng locationXDEV = new LLatLng(this.reg, 49.6756, 12.1610);
+		final LMarker markerXDEV =
+			new LMarker(this.reg, locationXDEV, new LMarkerOptions().withIcon(iconXDEV))
+				.bindPopup("<a href='https://xdev.software' target='_blank'>XDEV Software GmbH</a>");
+		
+		final LPolygon polygonNOC = new LPolygon(
+			this.reg,
+			new LLatLng(this.reg, 49.674883, 12.159098),
+			new LLatLng(this.reg, 49.675719, 12.160248),
+			new LLatLng(this.reg, 49.676080, 12.159985),
+			new LLatLng(this.reg, 49.675750, 12.158008),
+			new LLatLng(this.reg, 49.675306, 12.158499));
+		polygonNOC.bindPopup("NOC - NordOberpfalz Center")
+			.bindTooltip("This is a tooltip<br/>You can click to open the popup");
+		
+		final LCircle circleFood = new LCircle(
+			this.reg,
+			locationXDEV,
+			new LCircleOptions()
+				.withRadius(400d)
+				.withStroke(true)
+				.withColor("#000")
+				.withFill(false));
+		
+		final LMarker markerPizza = new LMarker(this.reg, new LLatLng(this.reg, 49.674413, 12.160925))
+			.bindPopup("Pizza");
+		
+		final LLatLng locationSchnitzel = new LLatLng(this.reg, 49.673800, 12.160113);
+		final LMarker markerSchnitzel = new LMarker(this.reg, locationSchnitzel)
+			.bindPopup("Schnitzel");
+		
+		final LPolyline polylineToSchnitzel = new LPolyline(
+			this.reg,
+			locationXDEV,
+			new LLatLng(this.reg, 49.675631, 12.160430),
+			new LLatLng(this.reg, 49.673919, 12.160769),
+			locationSchnitzel)
+			.bindPopup("Route to Schnitzel");
+		
+		final LLayerGroup lLayerGroupPlaces = new LLayerGroup(this.reg)
+			.addLayer(markerXDEV)
+			.addLayer(polygonNOC)
+			.addLayer(markerInfo);
+		final LLayerGroup lLayerGroupFood =
+			new LLayerGroup(this.reg, markerPizza, markerSchnitzel, circleFood, polylineToSchnitzel);
+		
+		// Add default layers
+		this.map
+			.addLayer(tlOSM)
+			.addLayer(lLayerGroupPlaces);
+		
+		this.addControls(tlOSM, tlOSMHOT, tlTopo, lLayerGroupPlaces, lLayerGroupFood);
+		
+		this.hlButtons.setWidthFull();
+		this.add(this.hlButtons);
+		
+		this.addEventDemo();
+		
+		this.addLocateDemo();
+		this.addMapMethodsDemo(center);
+		this.addImageOverlayDemo();
+		this.addVideoOverlayDemo();
+		this.addComplexPolygonDemo();
+		this.addRetrieveClientSideDataDemo();
+		
+		this.addOpenDialogOverMapDemo();
+	}
+	
+	private void addControls(
+		final LTileLayer tlOSM,
+		final LTileLayer tlOSMHOT,
+		final LTileLayer tlTopo,
+		final LLayerGroup lLayerGroupPlaces,
+		final LLayerGroup lLayerGroupFood)
+	{
+		// Use LinkedHashMap for order
+		final LinkedHashMap<String, LLayer<?>> baseLayers = new LinkedHashMap<>();
+		baseLayers.put("OSM", tlOSM);
+		baseLayers.put("OSM HOT", tlOSMHOT);
+		baseLayers.put("TOPO", tlTopo);
+		final LControlLayers lControlLayers = new LControlLayers(
+			this.reg,
+			baseLayers,
+			new LControlLayersOptions().withCollapsed(false))
+			.addOverlay(lLayerGroupPlaces, "Places")
+			.addOverlay(lLayerGroupFood, "Food")
+			.addTo(this.map);
+		// Apply manual patch for https://github.com/Leaflet/Leaflet/issues/9009 as this was not released yet
+		this.map.on(
+			"resize",
+			lControlLayers.clientComponentJsAccessor() + "._expandIfNotCollapsed",
+			lControlLayers.clientComponentJsAccessor());
+		
+		new LControlScale(this.reg, new LControlScaleOptions()).addTo(this.map);
+	}
+	
+	private void addEventDemo()
+	{
+		// See also https://vaadin.com/docs/latest/create-ui/element-api/client-server-rpc
+		this.map.on("click", "e => document.getElementById('" + ID + "').$server.mapClicked(e.latlng)");
+	}
+	
+	// This server side method will be called when the map is clicked
+	@ClientCallable
+	public void mapClicked(final JsonValue input)
+	{
+		if(!(input instanceof final JsonObject obj))
+		{
+			return;
+		}
+		
+		LOG.info("Map clicked - lat: {}, lng: {}", obj.getNumber("lat"), obj.getNumber("lng"));
+	}
+	
+	private void addLocateDemo()
+	{
+		this.map.on(
+			"locationerror",
+			"e => alert('Failed to locate: ' "
+				+ "+ '\\nCode: ' + e.code "
+				+ "+ '\\nMessage: ' + e.message"
+				+ ")");
+		this.map.on(
+			"locationfound",
+			"e => alert('Location successful: '"
+				+ "+ '\\nLocation: ' + e.latlng "
+				+ "+ '\\nBounds: ' + e.bounds?.getNorthWest() + ' ' + e.bounds?.getSouthEast() "
+				+ "+ '\\nAccuracy(m): ' + e.accuracy "
+				+ "+ '\\nAltitude(m): ' + e.altitude "
+				+ "+ '\\nAltitudeAccuracy(m): ' + e.altitudeAccuracy "
+				+ "+ '\\nHeading: ' + e.heading"
+				+ "+ '\\nSpeed: ' + e.speed "
+				+ ")");
+		this.hlButtons.add(new Button("Locate", ev -> this.map.locate(new LMapLocateOptions().withSetView(true))));
+	}
+	
+	private void addMapMethodsDemo(final LLatLng center)
+	{
+		this.hlButtons.add(new Button("Center on Weiden", ev -> this.map.setView(center, 17)));
+		this.hlButtons.add(new Button("FlyTo to Weiden", ev -> this.map.flyTo(center, 17)));
+	}
+	
+	private void addImageOverlayDemo()
+	{
+		final LImageOverlay imageOverlay = new LImageOverlay(
+			this.reg,
+			"https://maps.lib.utexas.edu/maps/historical/newark_nj_1922.jpg",
+			new LLatLngBounds(
+				this.reg,
+				new LLatLng(this.reg, 40.712216, -74.22655),
+				new LLatLng(this.reg, 40.773941, -74.12544)
+			)
+		);
+		this.hlButtons.add(this.createToggleButton(
+			"Show image",
+			"Hide image",
+			() -> {
+				imageOverlay.addTo(this.map);
+				this.map.setView(new LLatLng(this.reg, 40.74, -74.17), 12);
+			},
+			imageOverlay::remove
+		));
+	}
+	
+	private void addVideoOverlayDemo()
+	{
+		final LVideoOverlay videoOverlay = new LVideoOverlay(
+			this.reg,
+			"https://www.mapbox.com/bites/00188/patricia_nasa.webm",
+			new LLatLngBounds(
+				this.reg,
+				new LLatLng(this.reg, 32, -130),
+				new LLatLng(this.reg, 13, -100)
+			),
+			new LVideoOverlayOptions().withAttribution(
+				"<a href='https://www.youtube.com/watch?v=ZcxBOQTOb2Q'>NASA</a>"));
+		this.hlButtons.add(this.createToggleButton(
+			"Show video",
+			"Hide video",
+			() -> {
+				videoOverlay.addTo(this.map);
+				// Start video 30s in (otherwise no hurricane - boring)
+				videoOverlay.invokeSelf(".getElement().currentTime=30");
+				
+				this.map.setView(new LLatLng(this.reg, 20, -115), 5);
+				
+				// Play otherwise stops after hiding
+				videoOverlay.invokeSelf(".getElement()?.play()");
+			},
+			videoOverlay::remove
+		));
+	}
+	
+	private void addComplexPolygonDemo()
+	{
+		// See also 38.871008516069516, -77.0559701487416
+		final LPolygon pentagon = new LPolygon(
+			this.reg,
+			List.of(
+				List.of(
+					List.of(
+						new LLatLng(this.reg, 38.872923, -77.054687),
+						new LLatLng(this.reg, 38.870639, -77.053252),
+						new LLatLng(this.reg, 38.868895, -77.055569),
+						new LLatLng(this.reg, 38.870071, -77.058473),
+						new LLatLng(this.reg, 38.872570, -77.057877)
+					),
+					List.of(
+						new LLatLng(this.reg, 38.871749, -77.055494),
+						new LLatLng(this.reg, 38.870866, -77.054932),
+						new LLatLng(this.reg, 38.870225, -77.055829),
+						new LLatLng(this.reg, 38.870650, -77.056901),
+						new LLatLng(this.reg, 38.871607, -77.056723)
+					)
+				),
+				List.of(
+					new LLatLng(this.reg, 38.871107, -77.055903),
+					new LLatLng(this.reg, 38.870990, -77.055831),
+					new LLatLng(this.reg, 38.870899, -77.055950),
+					new LLatLng(this.reg, 38.870961, -77.056104),
+					new LLatLng(this.reg, 38.871089, -77.056072)
+				)
+			));
+		final String imageLink =
+			"https://upload.wikimedia.org/wikipedia/commons/thumb/f/f9/Building_and_ship_comparison_to_the_Pentagon2"
+				+ ".svg/260px-Building_and_ship_comparison_to_the_Pentagon2.svg.png";
+		pentagon.bindPopup("<a href='https://en.wikipedia.org/wiki/The_Pentagon' target='_blank'>"
+			+ "<center><b>The Pentagon</b></center><br>"
+			+ "<img style='width:12em' src='" + imageLink + "'>"
+			+ "</a>");
+		this.hlButtons.add(this.createToggleButton(
+			"Show complex polygon",
+			"Hide complex polygon",
+			() -> {
+				pentagon.addTo(this.map);
+				pentagon.openPopup();
+				
+				this.map.setView(new LLatLng(this.reg, 38.871008, -77.055970), 17);
+			},
+			pentagon::remove
+		));
+	}
+	
+	private void addRetrieveClientSideDataDemo()
+	{
+		// Note: Usage is not recommended as clientside data can be manipulated
+		this.hlButtons.add(
+			new Button(
+				"Get bounds",
+				ev -> this.map.invokeSelfReturn(".getBounds()")
+					.then(v -> Notification.show(v.toJson())))
+		);
+	}
+	
+	private void addOpenDialogOverMapDemo()
+	{
+		this.hlButtons.add(
+			new Button("Open dialog", ev ->
+			{
+				final Icon icoClose = VaadinIcon.CLOSE.create();
+				
+				final Dialog dialog = new Dialog(icoClose);
+				dialog.setDraggable(true);
+				dialog.setResizable(true);
+				dialog.setWidth("70vw");
+				dialog.setHeight("70vh");
+				dialog.open();
+				
+				icoClose.addClickListener(iev -> dialog.close());
+			}));
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/EventDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/EventDemo.java
new file mode 100644
index 00000000..9c685588
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/EventDemo.java
@@ -0,0 +1,66 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+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.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LMarker;
+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(EventDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class EventDemo extends VerticalLayout
+{
+	public static final String NAV = "/event";
+	
+	public EventDemo()
+	{
+		// Let the view use 100% of the site
+		this.setSizeFull();
+		
+		// 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));
+		
+		// Set what part of the world should be shown
+		map.setView(new LLatLng(reg, 49.6751, 12.1607), 17);
+		
+		// Create a new marker
+		new LMarker(reg, new LLatLng(reg, 49.6756, 12.1610))
+			// Bind a popup which is displayed when clicking the marker
+			.bindPopup("XDEV Software")
+			// Add it to the map
+			.addTo(map);
+		
+		final HorizontalLayout hlButtons = new HorizontalLayout();
+		
+		// Bind clickFunc to map so that it gets disposed when the map is disposed
+		final String clickFuncReference = map.clientComponentJsAccessor() + ".myCoolClickFunc";
+		reg.execJs(clickFuncReference + "=e => alert('You clicked: ' + e.latlng)");
+		
+		final String type = "click";
+		hlButtons.add(new Button("Register click", ev -> map.on(type, clickFuncReference)));
+		hlButtons.add(new Button("Register click once", ev -> map.once(type, clickFuncReference)));
+		hlButtons.add(new Button("Unregister click", ev -> map.off(type, clickFuncReference)));
+		
+		hlButtons.setWidthFull();
+		this.add(hlButtons);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/FreeingUpResourceBenchmarkDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/FreeingUpResourceBenchmarkDemo.java
new file mode 100644
index 00000000..1a8f93c0
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/FreeingUpResourceBenchmarkDemo.java
@@ -0,0 +1,173 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+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.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LMarker;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.registry.LDefaultComponentManagementRegistry;
+
+
+@Route(FreeingUpResourceBenchmarkDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class FreeingUpResourceBenchmarkDemo extends AbstractDemo
+{
+	public static final String NAV = "/freeing-up-resources-benchmark";
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FreeingUpResourceBenchmarkDemo.class);
+	
+	private final LDefaultComponentManagementRegistry reg;
+	private final LMap map;
+	private final HorizontalLayout hlButtons = new HorizontalLayout();
+	
+	public FreeingUpResourceBenchmarkDemo()
+	{
+		this.reg = new LDefaultComponentManagementRegistry(this);
+		
+		final MapContainer mapContainer = new MapContainer(this.reg);
+		mapContainer.setSizeFull();
+		this.add(mapContainer);
+		this.setSizeFull();
+		
+		this.map = mapContainer.getlMap();
+		
+		final LLatLng center = new LLatLng(this.reg, 49.675126, 12.160733);
+		this.map.setView(center, 17);
+		
+		// Add default layers
+		this.map.addLayer(LTileLayer.createDefaultForOpenStreetMapTileServer(this.reg));
+		
+		this.hlButtons.setWidthFull();
+		this.add(this.hlButtons);
+		
+		this.addMemoryTestDemo();
+	}
+	
+	/**
+	 * Used for testing if memory on the client side is freed up correctly when handling a lot of components.
+	 * <p/>
+	 * What does this do?<p/> Creates huge amounts of components, adds them to the UI and removes them. This happens in
+	 * iterative cycles. At the end of the test the browser should not use excessive amounts of memory as the
+	 * components are removed again (-> no memory leak).
+	 */
+	// S5413 - Yes it's used correctly
+	// S2245 - This is a reproducible demo
+	// S1215 - This is a memory test and we don't rely on random GC collects
+	@SuppressWarnings({"java:S5413", "java:S2245", "java:S1215", "java:S3776", "PMD"})
+	private void addMemoryTestDemo()
+	{
+		final AtomicBoolean abort = new AtomicBoolean(false);
+		
+		this.hlButtons.add(this.createToggleButton(
+			"Start browser memory test",
+			"Stop browser memory test",
+			() -> {
+				this.map.setView(new LLatLng(this.reg, 0, 0), 12);
+				
+				abort.set(false);
+				
+				final int bulkSize = 100;
+				final int sizeWhenStartRemoving = 1_000;
+				final int endWhen = 100_000;
+				
+				final AtomicLong totallyAdded = new AtomicLong(0);
+				final Random random = new Random(1);
+				final UI ui = UI.getCurrent();
+				
+				CompletableFuture.runAsync(() -> {
+					try
+					{
+						final List<LMarker> markers = new ArrayList<>();
+						while(!abort.get() && totallyAdded.get() < endWhen)
+						{
+							LOG.info("Totally added markers: {}; Adding bulk", totallyAdded);
+							
+							for(int i = 0; i < bulkSize; i++)
+							{
+								if(markers.size() > sizeWhenStartRemoving)
+								{
+									final LMarker removed = markers.remove(0);
+									
+									ui.accessSynchronously(removed::remove);
+								}
+								final double lat = random.nextDouble(-100, 100);
+								final double lng = random.nextDouble(-100, 100);
+								final double v = random.nextDouble();
+								
+								ui.accessSynchronously(() ->
+									markers.add(
+										new LMarker(
+											this.reg,
+											new LLatLng(
+												this.reg,
+												lat,
+												lng))
+											.bindPopup("Random double: " + v)
+											.addTo(this.map)));
+							}
+							
+							totallyAdded.set(totallyAdded.get() + bulkSize);
+							
+							LOG.info("Added {}x markers; Performing GC", bulkSize);
+							System.gc();
+							LOG.info("Finished GC; Syncing with client");
+							ui.accessSynchronously(this.reg::freeUpClient);
+							
+							if(!abort.get())
+							{
+								LOG.info("Waiting a moment");
+								Thread.sleep(10);
+							}
+						}
+						
+						LOG.info("Ending; Clearing...");
+						markers.forEach(m -> ui.accessSynchronously(m::remove));
+						markers.clear();
+						
+						for(int i = 0; i < 2; i++)
+						{
+							System.gc();
+							
+							Thread.sleep(100);
+							
+							ui.accessSynchronously(this.reg::freeUpClient);
+						}
+						
+						LOG.info("Done - Browser should no longer allocate a lot of RAM now");
+						
+						ui.accessSynchronously(() -> this.reg.execJs(
+							"alert('Finished memory test!'"
+								+ "+'\\nTracked components on client (less is better): ' "
+								+ "+ document.getElementById('"
+								+ this.reg.getId().orElseThrow()
+								+ "').lComponents.size);"));
+					}
+					catch(final InterruptedException ex)
+					{
+						Thread.currentThread().interrupt();
+						LOG.warn("Got interrupted", ex);
+					}
+					catch(final Exception ex)
+					{
+						LOG.error("Unexpected problem while testing", ex);
+					}
+				});
+			},
+			() -> abort.set(true)
+		));
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/InitialResizeDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/InitialResizeDemo.java
new file mode 100644
index 00000000..5dfbf304
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/InitialResizeDemo.java
@@ -0,0 +1,53 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+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.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LPolylineOptions;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LRectangle;
+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(InitialResizeDemo.NAV)
+public class InitialResizeDemo extends VerticalLayout
+{
+	public static final String NAV = "/initial-resize";
+	
+	public InitialResizeDemo()
+	{
+		this.setSizeFull();
+		
+		final LComponentManagementRegistry reg = new LDefaultComponentManagementRegistry(this);
+		
+		// We want to show this area initially
+		final LLatLngBounds bounds = new LLatLngBounds(
+			reg,
+			new LLatLng(reg, 49, 12),
+			new LLatLng(reg, 50, 11)
+		);
+		
+		final MapContainer mapContainer = new MapContainer(reg, map -> {
+			// This needs to be done after the map was initially resized
+			// otherwise the view is calculated incorrectly
+			map.fitBounds(bounds);
+		});
+		mapContainer.setSizeFull();
+		this.add(mapContainer);
+		
+		final LMap map = mapContainer.getlMap();
+		map.addLayer(LTileLayer.createDefaultForOpenStreetMapTileServer(reg));
+		
+		// Still required as the map refuses to work otherwise
+		map.setView(new LLatLng(reg, 0, 0), 1);
+		
+		// Create rectangle for reference
+		new LRectangle(reg, bounds, new LPolylineOptions())
+			.addTo(map);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/MinimalisticDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/MinimalisticDemo.java
new file mode 100644
index 00000000..c5e778a3
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/MinimalisticDemo.java
@@ -0,0 +1,50 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+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.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LMarker;
+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(MinimalisticDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class MinimalisticDemo extends VerticalLayout
+{
+	public static final String NAV = "/minimalistic";
+	
+	public MinimalisticDemo()
+	{
+		// Let the view use 100% of the site
+		this.setSizeFull();
+		
+		// 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));
+		
+		// Set what part of the world should be shown
+		map.setView(new LLatLng(reg, 49.6751, 12.1607), 17);
+		
+		// Create a new marker
+		new LMarker(reg, new LLatLng(reg, 49.6756, 12.1610))
+			// Bind a popup which is displayed when clicking the marker
+			.bindPopup("XDEV Software")
+			// Add it to the map
+			.addTo(map);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/MultiLayerWithPyramidDemo.java b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/MultiLayerWithPyramidDemo.java
new file mode 100644
index 00000000..2e6da23c
--- /dev/null
+++ b/vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/MultiLayerWithPyramidDemo.java
@@ -0,0 +1,215 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo;
+
+import java.util.List;
+
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.treegrid.TreeGrid;
+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.layer.LLayerGroup;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.layer.vector.LPolygon;
+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(MultiLayerWithPyramidDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class MultiLayerWithPyramidDemo extends HorizontalLayout
+{
+	public static final String NAV = "/multilayer";
+	private static final String WIKIPEDIA_THUMB = "https://upload.wikimedia.org/wikipedia/commons/thumb/";
+	
+	private static final List<BuildingData> DATA = List.of(
+		new BuildingComplex(
+			"Pyramids ▲",
+			List.of(
+				new Building(
+					"Great Pyramid of Giza",
+					"https://en.wikipedia.org/wiki/Great_Pyramid_of_Giza",
+					WIKIPEDIA_THUMB + "e/e3/Kheops-Pyramid.jpg/320px-Kheops-Pyramid.jpg",
+					createRectangleDataPoints(29.980138, 31.133104, 29.978121, 31.135367)),
+				new Building(
+					"Pyramid of Khafre",
+					"https://en.wikipedia.org/wiki/Pyramid_of_Khafre",
+					WIKIPEDIA_THUMB + "e/e4/Khephren_009.jpg/320px-Khephren_009.jpg",
+					createRectangleDataPoints(29.976912, 31.129671, 29.974964, 31.1318537)),
+				new Building(
+					"Pyramid of Menkaure",
+					"https://en.wikipedia.org/wiki/Pyramid_of_Menkaure",
+					WIKIPEDIA_THUMB
+						+ "3/38/Cairo%2C_Gizeh%2C_Pyramid_of_Menkaure%2C_Egypt%2C_Oct_2005"
+						+ ".jpg/320px-Cairo%2C_Gizeh%2C_Pyramid_of_Menkaure%2C_Egypt%2C_Oct_2005.jpg",
+					createRectangleDataPoints(29.972898, 31.127787, 29.972039, 31.1287585)))
+		),
+		new BuildingComplex(
+			"Other",
+			List.of(
+				new Building(
+					"Sphinx 🐈",
+					"https://en.wikipedia.org/wiki/Great_Sphinx_of_Giza",
+					WIKIPEDIA_THUMB
+						+ "f/f6/Great_Sphinx_of_Giza_-_20080716a.jpg/320px-Great_Sphinx_of_Giza_-_20080716a.jpg",
+					List.of(
+						new DataPoint(29.975283598029613, 31.137253754493454),
+						new DataPoint(29.97535970910997, 31.137377101561537),
+						new DataPoint(29.975335184460793, 31.13753679603173),
+						new DataPoint(29.975318920391995, 31.13770108133231),
+						new DataPoint(29.975354933683573, 31.137749361094116),
+						new DataPoint(29.975336346179866, 31.13798405438065),
+						new DataPoint(29.975286973106307, 31.137998135977842),
+						new DataPoint(29.975285230526783, 31.137849943931197),
+						new DataPoint(29.97525560667033, 31.137858661110414),
+						new DataPoint(29.975253864090273, 31.137986066037392),
+						new DataPoint(29.97520565269632, 31.137990759903126),
+						new DataPoint(29.97518358000214, 31.137748690541862),
+						new DataPoint(29.975196939791317, 31.1377151629295),
+						new DataPoint(29.975199844093044, 31.137524055539036),
+						new DataPoint(29.97517719053711, 31.13737251073115)
+					)),
+				new Building(
+					"Tomb of Queen Khentkaus I",
+					"https://en.wikipedia.org/wiki/Pyramid_of_Khentkaus_I",
+					"https://upload.wikimedia.org/wikipedia/commons/b/b6/Tomb_of_Khentkaus_I.jpg",
+					createRectangleDataPoints(29.973586, 31.135233, 29.973164, 31.135737)
+				)
+			)
+		)
+	);
+	
+	private final LComponentManagementRegistry reg;
+	
+	private LLayerGroup activeLayerGroup;
+	
+	public MultiLayerWithPyramidDemo()
+	{
+		// Let the view use 100% of the site
+		this.setSizeFull();
+		
+		final TreeGrid<BuildingData> treeGrid = new TreeGrid<>();
+		treeGrid.addHierarchyColumn(BuildingData::name)
+			.setHeader("Building");
+		treeGrid.setItems(DATA, BuildingData::nested);
+		treeGrid.setHeightFull();
+		treeGrid.setMinWidth("18em");
+		treeGrid.setWidth("20%");
+		
+		this.add(treeGrid);
+		
+		// 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);
+		
+		// Create and add the MapContainer (which contains the map) to the UI
+		final MapContainer mapContainer = new MapContainer(this.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(this.reg));
+		
+		// Set what part of the world should be shown
+		map.setView(new LLatLng(this.reg, 29.9759, 31.1350), 17);
+		
+		treeGrid.addSelectionListener(ev ->
+		{
+			if(this.activeLayerGroup != null)
+			{
+				this.activeLayerGroup.removeFrom(map);
+				this.activeLayerGroup = null;
+				
+				// Free up memory if needed
+				this.reg.freeUpClient();
+			}
+			
+			ev.getFirstSelectedItem().ifPresent(buildingData -> {
+				this.activeLayerGroup = new LLayerGroup(this.reg);
+				
+				if(buildingData instanceof final BuildingComplex complex)
+				{
+					complex.buildings().forEach(this::createPolygonAndAddToActiveLayerGroup);
+				}
+				else if(buildingData instanceof final Building building)
+				{
+					this.createPolygonAndAddToActiveLayerGroup(building);
+				}
+				
+				map.addLayer(this.activeLayerGroup);
+			});
+		});
+		
+		DATA.forEach(treeGrid::expand);
+		treeGrid.select(DATA.get(0));
+	}
+	
+	private void createPolygonAndAddToActiveLayerGroup(final Building building)
+	{
+		new LPolygon(this.reg, building.dataPoints().stream()
+			.map(dp -> new LLatLng(this.reg, dp.lat(), dp.lng()))
+			.toList())
+			.bindPopup(
+				"<a href='" + building.url() + "' target='_blank'>"
+					+ "<center><b>" + building.name() + "</b></center><br>"
+					+ "<img style='width:12em' src='" + building.imageUrl() + "'>"
+					+ "</a>")
+			.addTo(this.activeLayerGroup);
+	}
+	
+	record BuildingComplex(
+		String name,
+		List<Building> buildings
+	) implements BuildingData
+	{
+		@Override
+		public List<BuildingData> nested()
+		{
+			return this.buildings()
+				.stream()
+				.map(BuildingData.class::cast)
+				.toList();
+		}
+	}
+	
+	
+	record Building(
+		String name,
+		String url,
+		String imageUrl,
+		List<DataPoint> dataPoints
+	) implements BuildingData
+	{
+		@Override
+		public List<BuildingData> nested()
+		{
+			return List.of();
+		}
+	}
+	
+	interface BuildingData
+	{
+		String name();
+		
+		List<BuildingData> nested();
+	}
+	
+	static List<DataPoint> createRectangleDataPoints(
+		final double lat1, final double lng1,
+		final double lat2, final double lng2)
+	{
+		return List.of(
+			new DataPoint(lat1, lng1),
+			new DataPoint(lat1, lng2),
+			new DataPoint(lat2, lng2),
+			new DataPoint(lat2, lng1)
+		);
+	}
+	
+	record DataPoint(double lat, double lng)
+	{
+	}
+}
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/template-placeholder-demo/src/main/resources/application.yml b/vaadin-maps-leaflet-flow-demo/src/main/resources/application.yml
similarity index 100%
rename from template-placeholder-demo/src/main/resources/application.yml
rename to vaadin-maps-leaflet-flow-demo/src/main/resources/application.yml
diff --git a/template-placeholder/pom.xml b/vaadin-maps-leaflet-flow/pom.xml
similarity index 92%
rename from template-placeholder/pom.xml
rename to vaadin-maps-leaflet-flow/pom.xml
index 8fcc9518..c265b1fd 100644
--- a/template-placeholder/pom.xml
+++ b/vaadin-maps-leaflet-flow/pom.xml
@@ -5,20 +5,20 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>template-placeholder</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>vaadin-maps-leaflet-flow</artifactId>
+	<version>4.3.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>template-placeholder</name>
-	<description>template-placeholder</description>
-	<url>https://github.com/xdev-software/template-placeholder</url>
+	<name>vaadin-maps-leaflet-flow</name>
+	<description>vaadin-maps-leaflet-flow</description>
+	<url>https://github.com/xdev-software/vaadin-maps-leaflet-flow</url>
 
 	<scm>
-		<url>https://github.com/xdev-software/template-placeholder</url>
-		<connection>scm:git:https://github.com/xdev-software/template-placeholder.git</connection>
+		<url>https://github.com/xdev-software/vaadin-maps-leaflet-flow</url>
+		<connection>scm:git:https://github.com/xdev-software/vaadin-maps-leaflet-flow.git</connection>
 	</scm>
 
-	<inceptionYear>2022</inceptionYear>
+	<inceptionYear>2019</inceptionYear>
 
 	<organization>
 		<name>XDEV Software</name>
@@ -104,6 +104,18 @@
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-core</artifactId>
 		</dependency>
+		<!-- JSON JACKSON -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.17.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>1.12.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
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
new file mode 100644
index 00000000..6ddfceaa
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/MapContainer.java
@@ -0,0 +1,134 @@
+/*
+ * 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;
+
+import java.util.function.Consumer;
+
+import com.vaadin.flow.component.ClientCallable;
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.HasComponents;
+import com.vaadin.flow.component.HasSize;
+import com.vaadin.flow.component.HasStyle;
+import com.vaadin.flow.component.HasText;
+import com.vaadin.flow.component.Tag;
+import com.vaadin.flow.component.dependency.CssImport;
+import com.vaadin.flow.component.dependency.JsModule;
+import com.vaadin.flow.component.dependency.NpmPackage;
+import com.vaadin.flow.component.html.Div;
+
+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;
+
+
+/**
+ * Component that contains a {@link LMap} and all required client side dependencies for Vaadin.
+ */
+@NpmPackage(value = "leaflet", version = "1.9.4")
+@Tag("leaflet-map")
+@JsModule("leaflet/dist/leaflet.js")
+@CssImport("leaflet/dist/leaflet.css")
+public class MapContainer extends Composite<Div> implements HasSize, HasStyle, HasComponents, HasText
+{
+	private final LMap lMap;
+	
+	private Consumer<LMap> afterInitialResize;
+	
+	public MapContainer(final LComponentManagementRegistry reg)
+	{
+		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);
+	}
+	
+	/**
+	 * @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 LMapOptions options,
+		final Consumer<LMap> afterInitialResize)
+	{
+		this.afterInitialResize = afterInitialResize;
+		this.getContent().setSizeFull();
+		this.fixZIndex();
+		
+		this.lMap = new LMap(reg, this.getContent(), options);
+		this.fixInitialSizeAfterCreation();
+	}
+	
+	protected String ensureId()
+	{
+		// Id is auto assigned by LMap so this will never throw
+		return this.getContent().getId().orElseThrow();
+	}
+	
+	protected void fixZIndex()
+	{
+		LMap.fixZIndex(this.getContent());
+	}
+	
+	protected void fixInitialSizeAfterCreation()
+	{
+		this.lMap.fixInvalidSizeAfterCreation(this.afterInitialResize != null
+			? "document.getElementById('" + this.ensureId() + "').$server.onInitialResize();"
+			: null);
+	}
+	
+	@ClientCallable
+	public void onInitialResize()
+	{
+		if(this.afterInitialResize == null)
+		{
+			return;
+		}
+		
+		this.afterInitialResize.accept(this.getlMap());
+		// Free up
+		this.afterInitialResize = null;
+	}
+	
+	public LMap getlMap()
+	{
+		return this.lMap;
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LBaseComponent.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LBaseComponent.java
new file mode 100644
index 00000000..961cd7a2
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LBaseComponent.java
@@ -0,0 +1,48 @@
+/*
+ * 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.base;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+public abstract class LBaseComponent<S extends LComponent<S>> implements LComponent<S>
+{
+	private final LComponentManagementRegistry componentRegistry;
+	
+	protected LBaseComponent(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		this.componentRegistry = Objects.requireNonNull(compReg);
+		this.componentRegistry.add(this.self(), jsConstructorCallExpression, parameters);
+	}
+	
+	@Override
+	public LComponentManagementRegistry componentRegistry()
+	{
+		return this.componentRegistry;
+	}
+	
+	@Override
+	public String clientComponentJsAccessor()
+	{
+		return this.componentRegistry.clientComponentJsAccessor(this);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LComponent.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LComponent.java
new file mode 100644
index 00000000..0897ce8a
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LComponent.java
@@ -0,0 +1,52 @@
+/*
+ * 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.base;
+
+import java.io.Serializable;
+
+import com.vaadin.flow.component.page.PendingJavaScriptResult;
+
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+public interface LComponent<S extends LComponent<S>>
+{
+	LComponentManagementRegistry componentRegistry();
+	
+	default String clientComponentJsAccessor()
+	{
+		return this.componentRegistry().clientComponentJsAccessor(this);
+	}
+	
+	default PendingJavaScriptResult invokeSelf(final String payload, final Serializable... params)
+	{
+		return this.componentRegistry().execJs(this.clientComponentJsAccessor() + payload, params);
+	}
+	
+	/**
+	 * @apiNote Usage is not recommended as clientside data can be manipulated
+	 */
+	default PendingJavaScriptResult invokeSelfReturn(final String payload, final Serializable... params)
+	{
+		return this.componentRegistry().execJs("return " + this.clientComponentJsAccessor() + payload, params);
+	}
+	
+	@SuppressWarnings("unchecked")
+	default S self()
+	{
+		return (S)this;
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LComponentOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LComponentOptions.java
new file mode 100644
index 00000000..afb8806f
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LComponentOptions.java
@@ -0,0 +1,25 @@
+/*
+ * 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.base;
+
+public interface LComponentOptions<S extends LComponentOptions<S>>
+{
+	@SuppressWarnings("unchecked")
+	default S self()
+	{
+		return (S)this;
+	}
+}
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
new file mode 100644
index 00000000..8dee3bb0
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/LEvented.java
@@ -0,0 +1,182 @@
+/*
+ * 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.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>
+{
+	// region On/Off/Once
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-on">Leaflet docs</a>
+	 */
+	default S on(final String type, final String function, final String context)
+	{
+		this.invokeSelf(".on("
+			+ "$0,"
+			+ function
+			+ (context != null ? "," + context : "")
+			+ ")",
+			type);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-on">Leaflet docs</a>
+	 */
+	default S on(final String type, final String function)
+	{
+		return this.on(type, function, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-on">Leaflet docs</a>
+	 */
+	default S on(final String eventMap)
+	{
+		this.invokeSelf(".on($0)", eventMap);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-off">Leaflet docs</a>
+	 */
+	default S off(final String type, final String function, final String context)
+	{
+		this.invokeSelf(".off("
+				+ "$0,"
+				+ function
+				+ (context != null ? "," + context : "")
+				+ ")",
+			type);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-off">Leaflet docs</a>
+	 */
+	default S off(final String type, final String function)
+	{
+		return this.off(type, function, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-off">Leaflet docs</a>
+	 */
+	default S off(final String type)
+	{
+		return this.on(type, null, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-off">Leaflet docs</a>
+	 */
+	default S off()
+	{
+		this.invokeSelf(".off()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-once">Leaflet docs</a>
+	 */
+	default S once(final String type, final String function, final String context)
+	{
+		this.invokeSelf(".once("
+				+ "$0,"
+				+ function
+				+ (context != null ? "," + context : "")
+				+ ")",
+			type);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-once">Leaflet docs</a>
+	 */
+	default S once(final String type, final String function)
+	{
+		return this.once(type, function, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-once">Leaflet docs</a>
+	 */
+	default S once(final String eventMap)
+	{
+		this.invokeSelf(".once($0)", eventMap);
+		return this.self();
+	}
+	
+	// endregion
+	// region Fire/Listens
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-fire">Leaflet docs</a>
+	 */
+	default S fire(final String type, final String data, final Boolean propagate)
+	{
+		this.invokeSelf("fire($0"
+			+ (data != null ? "," + data : "")
+			+ (propagate != null ? "," + propagate : "")
+			+ ")", type);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-fire">Leaflet docs</a>
+	 */
+	default S fire(final String type, final String data)
+	{
+		return this.fire(type, data, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-fire">Leaflet docs</a>
+	 */
+	default S fire(final String type)
+	{
+		return this.fire(type, null);
+	}
+	
+	// endregion
+	// region Event Parent
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-addeventparent">Leaflet docs</a>
+	 */
+	default S addEventParent(final LEvented<?> obj)
+	{
+		this.invokeSelf("addEventParent(" + obj.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#evented-removeeventparent">Leaflet docs</a>
+	 */
+	default S removeEventParent(final LEvented<?> obj)
+	{
+		this.invokeSelf("removeEventParent(" + obj.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	// endregion
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/RawString.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/RawString.java
new file mode 100644
index 00000000..facc0a80
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/RawString.java
@@ -0,0 +1,36 @@
+/*
+ * 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.base;
+
+public class RawString
+{
+	private String value;
+	
+	public RawString(final String value)
+	{
+		this.value = value;
+	}
+	
+	public String getValue()
+	{
+		return this.value;
+	}
+	
+	public void setValue(final String value)
+	{
+		this.value = value;
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasBringTo.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasBringTo.java
new file mode 100644
index 00000000..35afb1b2
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasBringTo.java
@@ -0,0 +1,34 @@
+/*
+ * 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.base.has;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+
+
+public interface LHasBringTo<S extends LHasBringTo<S>> extends LComponent<S>
+{
+	default S bringToFront()
+	{
+		this.invokeSelf(".bringToFront()");
+		return this.self();
+	}
+	
+	default S bringToBack()
+	{
+		this.invokeSelf(".bringToBack()");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasOpacity.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasOpacity.java
new file mode 100644
index 00000000..eea796e0
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasOpacity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.base.has;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+
+
+public interface LHasOpacity<S extends LHasOpacity<S>> extends LComponent<S>
+{
+	default S setOpacity(final Double opacity)
+	{
+		this.invokeSelf(".setOpacity($0)", opacity);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasRedraw.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasRedraw.java
new file mode 100644
index 00000000..f8368086
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasRedraw.java
@@ -0,0 +1,28 @@
+/*
+ * 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.base.has;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+
+
+public interface LHasRedraw<S extends LHasRedraw<S>> extends LComponent<S>
+{
+	default S redraw()
+	{
+		this.invokeSelf(".redraw()");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasSetLatLng.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasSetLatLng.java
new file mode 100644
index 00000000..c06da9eb
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasSetLatLng.java
@@ -0,0 +1,29 @@
+/*
+ * 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.base.has;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+
+
+public interface LHasSetLatLng<S extends LHasSetLatLng<S>> extends LComponent<S>
+{
+	default S setLatLng(final LLatLng latLng)
+	{
+		this.invokeSelf(".setLatLng(" + latLng.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasSetZIndex.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasSetZIndex.java
new file mode 100644
index 00000000..65d59e23
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasSetZIndex.java
@@ -0,0 +1,28 @@
+/*
+ * 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.base.has;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+
+
+public interface LHasSetZIndex<S extends LHasSetZIndex<S>> extends LComponent<S>
+{
+	default S setZIndex(final Integer zIndex)
+	{
+		this.invokeSelf(".setZIndex($0)", zIndex);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LAbstractIconOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LAbstractIconOptions.java
new file mode 100644
index 00000000..a51a6a92
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LAbstractIconOptions.java
@@ -0,0 +1,228 @@
+/*
+ * 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.basictypes;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+
+
+public abstract class LAbstractIconOptions<S extends LAbstractIconOptions<S>> implements LComponentOptions<S>
+{
+	private String iconUrl;
+	private String iconRetinaUrl;
+	private LPoint iconSize;
+	private LPoint iconAnchor;
+	private LPoint popupAnchor;
+	private LPoint tooltipAnchor;
+	private String shadowUrl;
+	private String shadowRetinaUrl;
+	private LPoint shadowSize;
+	private LPoint shadowAnchor;
+	private String className;
+	// Boolean|String
+	private Object crossOrigin;
+	
+	public String getIconUrl()
+	{
+		return this.iconUrl;
+	}
+	
+	public void setIconUrl(final String iconUrl)
+	{
+		this.iconUrl = iconUrl;
+	}
+	
+	public S withIconUrl(final String iconUrl)
+	{
+		this.setIconUrl(iconUrl);
+		return this.self();
+	}
+	
+	public String getIconRetinaUrl()
+	{
+		return this.iconRetinaUrl;
+	}
+	
+	public void setIconRetinaUrl(final String iconRetinaUrl)
+	{
+		this.iconRetinaUrl = iconRetinaUrl;
+	}
+	
+	public S withIconRetinaUrl(final String iconRetinaUrl)
+	{
+		this.setIconRetinaUrl(iconRetinaUrl);
+		return this.self();
+	}
+	
+	public LPoint getIconSize()
+	{
+		return this.iconSize;
+	}
+	
+	public void setIconSize(final LPoint iconSize)
+	{
+		this.iconSize = iconSize;
+	}
+	
+	public S withIconSize(final LPoint iconSize)
+	{
+		this.setIconSize(iconSize);
+		return this.self();
+	}
+	
+	public LPoint getIconAnchor()
+	{
+		return this.iconAnchor;
+	}
+	
+	public void setIconAnchor(final LPoint iconAnchor)
+	{
+		this.iconAnchor = iconAnchor;
+	}
+	
+	public S withIconAnchor(final LPoint iconAnchor)
+	{
+		this.setIconAnchor(iconAnchor);
+		return this.self();
+	}
+	
+	public LPoint getPopupAnchor()
+	{
+		return this.popupAnchor;
+	}
+	
+	public void setPopupAnchor(final LPoint popupAnchor)
+	{
+		this.popupAnchor = popupAnchor;
+	}
+	
+	public S withPopupAnchor(final LPoint popupAnchor)
+	{
+		this.setPopupAnchor(popupAnchor);
+		return this.self();
+	}
+	
+	public LPoint getTooltipAnchor()
+	{
+		return this.tooltipAnchor;
+	}
+	
+	public void setTooltipAnchor(final LPoint tooltipAnchor)
+	{
+		this.tooltipAnchor = tooltipAnchor;
+	}
+	
+	public S withCrossOrigin(final LPoint tooltipAnchor)
+	{
+		this.setTooltipAnchor(tooltipAnchor);
+		return this.self();
+	}
+	
+	public String getShadowUrl()
+	{
+		return this.shadowUrl;
+	}
+	
+	public void setShadowUrl(final String shadowUrl)
+	{
+		this.shadowUrl = shadowUrl;
+	}
+	
+	public S withShadowUrl(final String shadowUrl)
+	{
+		this.setShadowUrl(shadowUrl);
+		return this.self();
+	}
+	
+	public String getShadowRetinaUrl()
+	{
+		return this.shadowRetinaUrl;
+	}
+	
+	public void setShadowRetinaUrl(final String shadowRetinaUrl)
+	{
+		this.shadowRetinaUrl = shadowRetinaUrl;
+	}
+	
+	public S withShadowRetinaUrl(final String shadowRetinaUrl)
+	{
+		this.setShadowRetinaUrl(shadowRetinaUrl);
+		return this.self();
+	}
+	
+	public LPoint getShadowSize()
+	{
+		return this.shadowSize;
+	}
+	
+	public void setShadowSize(final LPoint shadowSize)
+	{
+		this.shadowSize = shadowSize;
+	}
+	
+	public S withShadowSize(final LPoint shadowSize)
+	{
+		this.setShadowSize(shadowSize);
+		return this.self();
+	}
+	
+	public LPoint getShadowAnchor()
+	{
+		return this.shadowAnchor;
+	}
+	
+	public void setShadowAnchor(final LPoint shadowAnchor)
+	{
+		this.shadowAnchor = shadowAnchor;
+	}
+	
+	public S withShadowAnchor(final LPoint shadowAnchor)
+	{
+		this.setShadowAnchor(shadowAnchor);
+		return this.self();
+	}
+	
+	public String getClassName()
+	{
+		return this.className;
+	}
+	
+	public void setClassName(final String className)
+	{
+		this.className = className;
+	}
+	
+	public S withClassName(final String className)
+	{
+		this.setClassName(className);
+		return this.self();
+	}
+	
+	public Object getCrossOrigin()
+	{
+		return this.crossOrigin;
+	}
+	
+	public void setCrossOrigin(final Object crossOrigin)
+	{
+		this.crossOrigin = crossOrigin;
+	}
+	
+	public S withCrossOrigin(final Object crossOrigin)
+	{
+		this.setCrossOrigin(crossOrigin);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LDivIcon.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LDivIcon.java
new file mode 100644
index 00000000..f367cf6a
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LDivIcon.java
@@ -0,0 +1,32 @@
+/*
+ * 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.basictypes;
+
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#divicon">Leaflet docs</a>
+ */
+public class LDivIcon extends LIcon
+{
+	public LDivIcon(
+		final LComponentManagementRegistry compReg,
+		final LDivIconOptions options)
+	{
+		super(compReg, "L.divIcon", options);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LDivIconOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LDivIconOptions.java
new file mode 100644
index 00000000..21d218b0
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LDivIconOptions.java
@@ -0,0 +1,57 @@
+/*
+ * 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.basictypes;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#divicon">Leaflet docs</a>
+ */
+public class LDivIconOptions extends LAbstractIconOptions<LDivIconOptions>
+{
+	private String html;
+	private LPoint bgPos;
+	
+	public String getHtml()
+	{
+		return this.html;
+	}
+	
+	public void setHtml(final String html)
+	{
+		this.html = html;
+	}
+	
+	public LDivIconOptions withHtml(final String html)
+	{
+		this.setHtml(html);
+		return this.self();
+	}
+	
+	public LPoint getBgPos()
+	{
+		return this.bgPos;
+	}
+	
+	public void setBgPos(final LPoint bgPos)
+	{
+		this.bgPos = bgPos;
+	}
+	
+	public LDivIconOptions withBgPos(final LPoint bgPos)
+	{
+		this.setBgPos(bgPos);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LIcon.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LIcon.java
new file mode 100644
index 00000000..576a39c3
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LIcon.java
@@ -0,0 +1,41 @@
+/*
+ * 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.basictypes;
+
+import software.xdev.vaadin.maps.leaflet.base.LBaseComponent;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#icon">Leaflet docs</a>
+ */
+public class LIcon extends LBaseComponent<LIcon>
+{
+	protected LIcon(
+		final LComponentManagementRegistry compReg,
+		final String jsCreate,
+		final LAbstractIconOptions<?> options)
+	{
+		super(compReg, jsCreate + "(" + compReg.writeOptions(options) + ")");
+	}
+	
+	public LIcon(
+		final LComponentManagementRegistry compReg,
+		final LIconOptions options)
+	{
+		this(compReg, "L.icon", options);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LIconOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LIconOptions.java
new file mode 100644
index 00000000..54fdc860
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LIconOptions.java
@@ -0,0 +1,23 @@
+/*
+ * 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.basictypes;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#icon">Leaflet docs</a>
+ */
+public class LIconOptions extends LAbstractIconOptions<LIconOptions>
+{
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LLatLng.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LLatLng.java
new file mode 100644
index 00000000..4d11e334
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LLatLng.java
@@ -0,0 +1,40 @@
+/*
+ * 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.basictypes;
+
+import software.xdev.vaadin.maps.leaflet.base.LBaseComponent;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#latlng">Leaflet docs</a>
+ */
+public class LLatLng extends LBaseComponent<LLatLng>
+{
+	public LLatLng(final LComponentManagementRegistry componentRegistry, final double lat, final double lng)
+	{
+		super(componentRegistry, "L.latLng($0, $1)", lat, lng);
+	}
+	
+	public LLatLng(
+		final LComponentManagementRegistry componentRegistry,
+		final double lat,
+		final double lng,
+		final double altitude)
+	{
+		super(componentRegistry, "L.latLng($0, $1, $2)", lat, lng, altitude);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LLatLngBounds.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LLatLngBounds.java
new file mode 100644
index 00000000..00d4a75a
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LLatLngBounds.java
@@ -0,0 +1,35 @@
+/*
+ * 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.basictypes;
+
+import software.xdev.vaadin.maps.leaflet.base.LBaseComponent;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#latlngbounds">Leaflet docs</a>
+ */
+public class LLatLngBounds extends LBaseComponent<LLatLngBounds>
+{
+	public LLatLngBounds(
+		final LComponentManagementRegistry compReg,
+		final LLatLng corner1,
+		final LLatLng corner2)
+	{
+		super(compReg, "L.latLngBounds(" + corner1.clientComponentJsAccessor()
+			+ "," + corner2.clientComponentJsAccessor() + ")");
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LPoint.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LPoint.java
new file mode 100644
index 00000000..d892799f
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/basictypes/LPoint.java
@@ -0,0 +1,41 @@
+/*
+ * 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.basictypes;
+
+import software.xdev.vaadin.maps.leaflet.base.LBaseComponent;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#point">Leaflet docs</a>
+ */
+public class LPoint extends LBaseComponent<LPoint>
+{
+	public LPoint(
+		final LComponentManagementRegistry compReg,
+		final int x,
+		final int y)
+	{
+		super(compReg, "L.point($0, $1)", x, y);
+	}
+	
+	public LPoint(
+		final LComponentManagementRegistry compReg,
+		final int[] arr)
+	{
+		super(compReg, "L.point($0, $1)", arr[0], arr[1]);
+	}
+}
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
new file mode 100644
index 00000000..128b099e
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControl.java
@@ -0,0 +1,72 @@
+/*
+ * 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.controls;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.base.LBaseComponent;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control">Leaflet docs</a>
+ */
+public abstract class LControl<S extends LControl<S>> extends LBaseComponent<S>
+{
+	protected LControl(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#control-setposition">Leaflet docs</a>
+	 */
+	public S setPosition(final String position)
+	{
+		this.invokeSelf(".setPosition($0)", position);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#control-addto">Leaflet docs</a>
+	 */
+	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/LControlAttribution.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlAttribution.java
new file mode 100644
index 00000000..a9ee0a2f
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlAttribution.java
@@ -0,0 +1,32 @@
+/*
+ * 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.controls;
+
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-attribution">Leaflet docs</a>
+ */
+public class LControlAttribution extends LControl<LControlAttribution>
+{
+	public LControlAttribution(
+		final LComponentManagementRegistry compReg,
+		final LControlAttributionOptions options)
+	{
+		super(compReg, "L.control.attribution(" + compReg.writeOptions(options) + ")");
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlAttributionOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlAttributionOptions.java
new file mode 100644
index 00000000..b620b4a5
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlAttributionOptions.java
@@ -0,0 +1,41 @@
+/*
+ * 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.controls;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-attribution">Leaflet docs</a>
+ */
+public class LControlAttributionOptions extends LControlOptions<LControlAttributionOptions>
+{
+	// String|false
+	private Object prefix;
+	
+	public Object getPrefix()
+	{
+		return this.prefix;
+	}
+	
+	public void setPrefix(final Object prefix)
+	{
+		this.prefix = prefix;
+	}
+	
+	public LControlAttributionOptions withPrefix(final Object prefix)
+	{
+		this.setPrefix(prefix);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..cea1c9c5
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayers.java
@@ -0,0 +1,128 @@
+/*
+ * 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.controls;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.text.StringEscapeUtils;
+
+import software.xdev.vaadin.maps.leaflet.layer.LLayer;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-layers">Leaflet docs</a>
+ */
+public class LControlLayers extends LControl<LControlLayers>
+{
+	public LControlLayers(
+		final LComponentManagementRegistry compReg,
+		final Map<String, LLayer<?>> baselayers,
+		final Map<String, LLayer<?>> overlays,
+		final LControlLayersOptions options)
+	{
+		super(compReg, "L.control.layers("
+			+ (baselayers != null ? convertLayerMapToString(baselayers) : "{}")
+			+ "," + (overlays != null ? convertLayerMapToString(overlays) : "{}")
+			+ compReg.writeOptionsOptionalNextParameter(options)
+			+ ")");
+	}
+	
+	public LControlLayers(
+		final LComponentManagementRegistry compReg,
+		final Map<String, LLayer<?>> baselayers,
+		final Map<String, LLayer<?>> overlays)
+	{
+		this(compReg, baselayers, overlays, null);
+	}
+	
+	public LControlLayers(
+		final LComponentManagementRegistry compReg,
+		final Map<String, LLayer<?>> baselayers,
+		final LControlLayersOptions options)
+	{
+		this(compReg, baselayers, null, options);
+	}
+	
+	public LControlLayers(
+		final LComponentManagementRegistry compReg,
+		final Map<String, LLayer<?>> baselayers)
+	{
+		this(compReg, baselayers, (LControlLayersOptions)null);
+	}
+	
+	public LControlLayers(final LComponentManagementRegistry compReg)
+	{
+		this(compReg, null);
+	}
+	
+	protected static String convertLayerMapToString(final Map<String, LLayer<?>> map)
+	{
+		return "{"
+			+ map.entrySet()
+			.stream()
+			.map(e -> "\"" + StringEscapeUtils.escapeEcmaScript(e.getKey()) + "\":"
+				+ e.getValue().clientComponentJsAccessor())
+			.collect(Collectors.joining(","))
+			+ "}";
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#control-layers-addbaselayer">Leaflet docs</a>
+	 */
+	public LControlLayers addBaseLayer(final LLayer<?> layer, final String name)
+	{
+		this.invokeSelf(".addBaseLayer(" + layer.clientComponentJsAccessor() + ",$0)", name);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#control-layers-addoverlay">Leaflet docs</a>
+	 */
+	public LControlLayers addOverlay(final LLayer<?> layer, final String name)
+	{
+		this.invokeSelf(".addOverlay(" + layer.clientComponentJsAccessor() + ",$0)", name);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#control-layers-removelayer">Leaflet docs</a>
+	 */
+	public LControlLayers removeLayer(final LLayer<?> layer)
+	{
+		this.invokeSelf(".removeLayer(" + layer.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#control-layers-expand">Leaflet docs</a>
+	 */
+	public LControlLayers expand()
+	{
+		this.invokeSelf(".expand()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#control-layers-collapse">Leaflet docs</a>
+	 */
+	public LControlLayers collapse()
+	{
+		this.invokeSelf(".collapse()");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayersOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayersOptions.java
new file mode 100644
index 00000000..7e433a76
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayersOptions.java
@@ -0,0 +1,111 @@
+/*
+ * 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.controls;
+
+import software.xdev.vaadin.maps.leaflet.base.RawString;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-layers">Leaflet docs</a>
+ */
+public class LControlLayersOptions extends LControlOptions<LControlLayersOptions>
+{
+	private Boolean collapsed;
+	private Boolean autoZIndex;
+	private Boolean hideSingleBase;
+	private Boolean sortLayers;
+	private RawString sortFunction;
+	
+	public Boolean getCollapsed()
+	{
+		return this.collapsed;
+	}
+	
+	public void setCollapsed(final Boolean collapsed)
+	{
+		this.collapsed = collapsed;
+	}
+	
+	public LControlLayersOptions withCollapsed(final Boolean collapsed)
+	{
+		this.setCollapsed(collapsed);
+		return this.self();
+	}
+	
+	public Boolean getAutoZIndex()
+	{
+		return this.autoZIndex;
+	}
+	
+	public void setAutoZIndex(final Boolean autoZIndex)
+	{
+		this.autoZIndex = autoZIndex;
+	}
+	
+	public LControlLayersOptions withAutoZIndex(final Boolean autoZIndex)
+	{
+		this.setAutoZIndex(autoZIndex);
+		return this.self();
+	}
+	
+	public Boolean getHideSingleBase()
+	{
+		return this.hideSingleBase;
+	}
+	
+	public void setHideSingleBase(final Boolean hideSingleBase)
+	{
+		this.hideSingleBase = hideSingleBase;
+	}
+	
+	public LControlLayersOptions withHideSingleBase(final Boolean hideSingleBase)
+	{
+		this.setHideSingleBase(hideSingleBase);
+		return this.self();
+	}
+	
+	public Boolean getSortLayers()
+	{
+		return this.sortLayers;
+	}
+	
+	public void setSortLayers(final Boolean sortLayers)
+	{
+		this.sortLayers = sortLayers;
+	}
+	
+	public LControlLayersOptions withSortLayers(final Boolean sortLayers)
+	{
+		this.setSortLayers(sortLayers);
+		return this.self();
+	}
+	
+	public RawString getSortFunction()
+	{
+		return this.sortFunction;
+	}
+	
+	public void setSortFunction(final RawString sortFunction)
+	{
+		this.sortFunction = sortFunction;
+	}
+	
+	public LControlLayersOptions withSortFunction(final RawString sortFunction)
+	{
+		this.setSortFunction(sortFunction);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlOptions.java
new file mode 100644
index 00000000..25703a86
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlOptions.java
@@ -0,0 +1,43 @@
+/*
+ * 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.controls;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control">Leaflet docs</a>
+ */
+public abstract class LControlOptions<S extends LControlOptions<S>> implements LComponentOptions<S>
+{
+	private String position;
+	
+	public String getPosition()
+	{
+		return this.position;
+	}
+	
+	public void setPosition(final String position)
+	{
+		this.position = position;
+	}
+	
+	public S withPosition(final String position)
+	{
+		this.setPosition(position);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlScale.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlScale.java
new file mode 100644
index 00000000..6a9ae1ee
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlScale.java
@@ -0,0 +1,32 @@
+/*
+ * 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.controls;
+
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-scale">Leaflet docs</a>
+ */
+public class LControlScale extends LControl<LControlScale>
+{
+	public LControlScale(
+		final LComponentManagementRegistry compReg,
+		final LControlScaleOptions options)
+	{
+		super(compReg, "L.control.scale(" + compReg.writeOptions(options) + ")");
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlScaleOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlScaleOptions.java
new file mode 100644
index 00000000..758eb146
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlScaleOptions.java
@@ -0,0 +1,91 @@
+/*
+ * 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.controls;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-scale">Leaflet docs</a>
+ */
+public class LControlScaleOptions extends LControlOptions<LControlScaleOptions>
+{
+	private Integer maxWidth;
+	private Boolean metric;
+	private Boolean imperial;
+	private Boolean updateWhenIdle;
+	
+	public Integer getMaxWidth()
+	{
+		return this.maxWidth;
+	}
+	
+	public void setMaxWidth(final Integer maxWidth)
+	{
+		this.maxWidth = maxWidth;
+	}
+	
+	public LControlScaleOptions withMaxWidth(final Integer maxWidth)
+	{
+		this.setMaxWidth(maxWidth);
+		return this.self();
+	}
+	
+	public Boolean getMetric()
+	{
+		return this.metric;
+	}
+	
+	public void setMetric(final Boolean metric)
+	{
+		this.metric = metric;
+	}
+	
+	public LControlScaleOptions withMetric(final Boolean metric)
+	{
+		this.setMetric(metric);
+		return this.self();
+	}
+	
+	public Boolean getImperial()
+	{
+		return this.imperial;
+	}
+	
+	public void setImperial(final Boolean imperial)
+	{
+		this.imperial = imperial;
+	}
+	
+	public LControlScaleOptions withImperial(final Boolean imperial)
+	{
+		this.setImperial(imperial);
+		return this.self();
+	}
+	
+	public Boolean getUpdateWhenIdle()
+	{
+		return this.updateWhenIdle;
+	}
+	
+	public void setUpdateWhenIdle(final Boolean updateWhenIdle)
+	{
+		this.updateWhenIdle = updateWhenIdle;
+	}
+	
+	public LControlScaleOptions withUpdateWhenIdle(final Boolean updateWhenIdle)
+	{
+		this.setUpdateWhenIdle(updateWhenIdle);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlZoom.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlZoom.java
new file mode 100644
index 00000000..84e0b064
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlZoom.java
@@ -0,0 +1,32 @@
+/*
+ * 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.controls;
+
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-zoom">Leaflet docs</a>
+ */
+public class LControlZoom extends LControl<LControlZoom>
+{
+	public LControlZoom(
+		final LComponentManagementRegistry compReg,
+		final LControlZoomOptions options)
+	{
+		super(compReg, "L.control.zoom(" + compReg.writeOptions(options) + ")");
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlZoomOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlZoomOptions.java
new file mode 100644
index 00000000..16de20f0
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlZoomOptions.java
@@ -0,0 +1,92 @@
+/*
+ * 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.controls;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#control-zoom">Leaflet docs</a>
+ */
+public class LControlZoomOptions extends LControlOptions<LControlZoomOptions>
+{
+	private String zoomInText;
+	private String zoomInTitle;
+	private String zoomOutText;
+	private String zoomOutTitle;
+	
+	public String getZoomInText()
+	{
+		return this.zoomInText;
+	}
+	
+	public void setZoomInText(final String zoomInText)
+	{
+		this.zoomInText = zoomInText;
+	}
+	
+	public LControlZoomOptions withZoomInText(final String zoomInText)
+	{
+		this.setZoomInText(zoomInText);
+		return this.self();
+	}
+	
+	public String getZoomInTitle()
+	{
+		return this.zoomInTitle;
+	}
+	
+	public void setZoomInTitle(final String zoomInTitle)
+	{
+		this.zoomInTitle = zoomInTitle;
+	}
+	
+	public LControlZoomOptions withZoomInTitle(final String zoomInTitle)
+	{
+		this.setZoomInTitle(zoomInTitle);
+		return this.self();
+	}
+	
+	public String getZoomOutText()
+	{
+		return this.zoomOutText;
+	}
+	
+	public void setZoomOutText(final String zoomOutText)
+	{
+		this.zoomOutText = zoomOutText;
+	}
+	
+	public LControlZoomOptions withZoomOutText(final String zoomOutText)
+	{
+		this.setZoomOutText(zoomOutText);
+		return this.self();
+	}
+	
+	public String getZoomOutTitle()
+	{
+		return this.zoomOutTitle;
+	}
+	
+	public void setZoomOutTitle(final String zoomOutTitle)
+	{
+		this.zoomOutTitle = zoomOutTitle;
+	}
+	
+	public LControlZoomOptions withZoomOutTitle(final String zoomOutTitle)
+	{
+		this.setZoomOutTitle(zoomOutTitle);
+		return this.self();
+	}
+}
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/LAbstractImageOverlayOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LAbstractImageOverlayOptions.java
new file mode 100644
index 00000000..4e5f90b4
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LAbstractImageOverlayOptions.java
@@ -0,0 +1,124 @@
+/*
+ * 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.layer;
+
+public abstract class LAbstractImageOverlayOptions<S extends LAbstractImageOverlayOptions<S>>
+	extends LInteractiveLayerOptions<S>
+{
+	private Double opacity;
+	private String alt;
+	// Boolean|String
+	private Object crossOrigin;
+	private String errorOverlayUrl;
+	private Integer zIndex;
+	private String className;
+	
+	public Double getOpacity()
+	{
+		return this.opacity;
+	}
+	
+	public void setOpacity(final Double opacity)
+	{
+		this.opacity = opacity;
+	}
+	
+	public S withOpacity(final Double opacity)
+	{
+		this.setOpacity(opacity);
+		return this.self();
+	}
+	
+	public String getAlt()
+	{
+		return this.alt;
+	}
+	
+	public void setAlt(final String alt)
+	{
+		this.alt = alt;
+	}
+	
+	public S withAlt(final String alt)
+	{
+		this.setAlt(alt);
+		return this.self();
+	}
+	
+	public Object getCrossOrigin()
+	{
+		return this.crossOrigin;
+	}
+	
+	public void setCrossOrigin(final Object crossOrigin)
+	{
+		this.crossOrigin = crossOrigin;
+	}
+	
+	public S withCrossOrigin(final Object crossOrigin)
+	{
+		this.setCrossOrigin(crossOrigin);
+		return this.self();
+	}
+	
+	public String getErrorOverlayUrl()
+	{
+		return this.errorOverlayUrl;
+	}
+	
+	public void setErrorOverlayUrl(final String errorOverlayUrl)
+	{
+		this.errorOverlayUrl = errorOverlayUrl;
+	}
+	
+	public S withErrorOverlayUrl(final String errorOverlayUrl)
+	{
+		this.setErrorOverlayUrl(errorOverlayUrl);
+		return this.self();
+	}
+	
+	public Integer getzIndex()
+	{
+		return this.zIndex;
+	}
+	
+	public void setzIndex(final Integer zIndex)
+	{
+		this.zIndex = zIndex;
+	}
+	
+	public S withZIndex(final Integer zIndex)
+	{
+		this.setzIndex(zIndex);
+		return this.self();
+	}
+	
+	public String getClassName()
+	{
+		return this.className;
+	}
+	
+	public void setClassName(final String className)
+	{
+		this.className = className;
+	}
+	
+	public S withClassName(final String className)
+	{
+		this.setClassName(className);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LGridLayer.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LGridLayer.java
new file mode 100644
index 00000000..9c258e22
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LGridLayer.java
@@ -0,0 +1,40 @@
+/*
+ * 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.layer;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.base.has.LHasBringTo;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasOpacity;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasRedraw;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasSetZIndex;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#gridlayer">Leaflet docs</a>
+ */
+public abstract class LGridLayer<S extends LGridLayer<S>> extends LLayer<S>
+	implements LHasBringTo<S>, LHasOpacity<S>, LHasRedraw<S>, LHasSetZIndex<S>
+{
+	protected LGridLayer(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LGridLayerOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LGridLayerOptions.java
new file mode 100644
index 00000000..e6cdd4b9
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LGridLayerOptions.java
@@ -0,0 +1,265 @@
+/*
+ * 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.layer;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#gridlayer-option">Leaflet docs</a>
+ */
+public abstract class LGridLayerOptions<S extends LGridLayerOptions<S>> extends LLayerOptions<S>
+{
+	// Number|Point
+	private Object tileSize;
+	private Double opacity;
+	private Boolean updateWhenIdle;
+	private Boolean updateWhenZooming;
+	private Integer updateInterval;
+	private Integer zIndex;
+	private LLatLngBounds latLngBounds;
+	private Integer minZoom;
+	private Integer maxZoom;
+	private Integer minNativeZoom;
+	private Integer maxNativeZoom;
+	private Boolean noWrap;
+	private String className;
+	private Integer keepBuffer;
+	
+	public Object getTileSize()
+	{
+		return this.tileSize;
+	}
+	
+	public void setTileSize(final Object tileSize)
+	{
+		this.tileSize = tileSize;
+	}
+	
+	public S withTileSize(final Object tileSize)
+	{
+		this.setTileSize(tileSize);
+		return this.self();
+	}
+	
+	public Double getOpacity()
+	{
+		return this.opacity;
+	}
+	
+	public void setOpacity(final Double opacity)
+	{
+		this.opacity = opacity;
+	}
+	
+	public S withOpacity(final Double opacity)
+	{
+		this.setOpacity(opacity);
+		return this.self();
+	}
+	
+	public Boolean getUpdateWhenIdle()
+	{
+		return this.updateWhenIdle;
+	}
+	
+	public void setUpdateWhenIdle(final Boolean updateWhenIdle)
+	{
+		this.updateWhenIdle = updateWhenIdle;
+	}
+	
+	public S withUpdateWhenIdle(final Boolean updateWhenIdle)
+	{
+		this.setUpdateWhenIdle(updateWhenIdle);
+		return this.self();
+	}
+	
+	public Boolean getUpdateWhenZooming()
+	{
+		return this.updateWhenZooming;
+	}
+	
+	public void setUpdateWhenZooming(final Boolean updateWhenZooming)
+	{
+		this.updateWhenZooming = updateWhenZooming;
+	}
+	
+	public S withUpdateWhenZooming(final Boolean updateWhenZooming)
+	{
+		this.setUpdateWhenZooming(updateWhenZooming);
+		return this.self();
+	}
+	
+	public Integer getUpdateInterval()
+	{
+		return this.updateInterval;
+	}
+	
+	public void setUpdateInterval(final Integer updateInterval)
+	{
+		this.updateInterval = updateInterval;
+	}
+	
+	public S withUpdateInterval(final Integer updateInterval)
+	{
+		this.setUpdateInterval(updateInterval);
+		return this.self();
+	}
+	
+	public Integer getzIndex()
+	{
+		return this.zIndex;
+	}
+	
+	public void setzIndex(final Integer zIndex)
+	{
+		this.zIndex = zIndex;
+	}
+	
+	public S withZIndex(final Integer zIndex)
+	{
+		this.setzIndex(zIndex);
+		return this.self();
+	}
+	
+	public LLatLngBounds getLatLngBounds()
+	{
+		return this.latLngBounds;
+	}
+	
+	public void setLatLngBounds(final LLatLngBounds latLngBounds)
+	{
+		this.latLngBounds = latLngBounds;
+	}
+	
+	public S withLatLngBounds(final LLatLngBounds latLngBounds)
+	{
+		this.setLatLngBounds(latLngBounds);
+		return this.self();
+	}
+	
+	public Integer getMinZoom()
+	{
+		return this.minZoom;
+	}
+	
+	public void setMinZoom(final Integer minZoom)
+	{
+		this.minZoom = minZoom;
+	}
+	
+	public S withMinZoom(final Integer minZoom)
+	{
+		this.setMinZoom(minZoom);
+		return this.self();
+	}
+	
+	public Integer getMaxZoom()
+	{
+		return this.maxZoom;
+	}
+	
+	public void setMaxZoom(final Integer maxZoom)
+	{
+		this.maxZoom = maxZoom;
+	}
+	
+	public S withMaxZoom(final Integer maxZoom)
+	{
+		this.setMaxZoom(maxZoom);
+		return this.self();
+	}
+	
+	public Integer getMinNativeZoom()
+	{
+		return this.minNativeZoom;
+	}
+	
+	public void setMinNativeZoom(final Integer minNativeZoom)
+	{
+		this.minNativeZoom = minNativeZoom;
+	}
+	
+	public S withMinNativeZoom(final Integer minNativeZoom)
+	{
+		this.setMinNativeZoom(minNativeZoom);
+		return this.self();
+	}
+	
+	public Integer getMaxNativeZoom()
+	{
+		return this.maxNativeZoom;
+	}
+	
+	public void setMaxNativeZoom(final Integer maxNativeZoom)
+	{
+		this.maxNativeZoom = maxNativeZoom;
+	}
+	
+	public S withMaxNativeZoom(final Integer maxNativeZoom)
+	{
+		this.setMaxNativeZoom(maxNativeZoom);
+		return this.self();
+	}
+	
+	public Boolean getNoWrap()
+	{
+		return this.noWrap;
+	}
+	
+	public void setNoWrap(final Boolean noWrap)
+	{
+		this.noWrap = noWrap;
+	}
+	
+	public S withNoWrap(final Boolean noWrap)
+	{
+		this.setNoWrap(noWrap);
+		return this.self();
+	}
+	
+	public String getClassName()
+	{
+		return this.className;
+	}
+	
+	public void setClassName(final String className)
+	{
+		this.className = className;
+	}
+	
+	public S withClassName(final String className)
+	{
+		this.setClassName(className);
+		return this.self();
+	}
+	
+	public Integer getKeepBuffer()
+	{
+		return this.keepBuffer;
+	}
+	
+	public void setKeepBuffer(final Integer keepBuffer)
+	{
+		this.keepBuffer = keepBuffer;
+	}
+	
+	public S withKeepBuffer(final Integer keepBuffer)
+	{
+		this.setKeepBuffer(keepBuffer);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LInteractiveLayer.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LInteractiveLayer.java
new file mode 100644
index 00000000..407556e2
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LInteractiveLayer.java
@@ -0,0 +1,32 @@
+/*
+ * 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.layer;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+public abstract class LInteractiveLayer<S extends LInteractiveLayer<S>> extends LLayer<S>
+{
+	protected LInteractiveLayer(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LInteractiveLayerOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LInteractiveLayerOptions.java
new file mode 100644
index 00000000..c6d73259
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LInteractiveLayerOptions.java
@@ -0,0 +1,57 @@
+/*
+ * 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.layer;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#interactive-layer-option">Leaflet docs</a>
+ */
+public abstract class LInteractiveLayerOptions<S extends LInteractiveLayerOptions<S>> extends LLayerOptions<S>
+{
+	private Boolean interactive;
+	private Boolean bubblingMouseEvents;
+	
+	public Boolean getInteractive()
+	{
+		return this.interactive;
+	}
+	
+	public void setInteractive(final Boolean interactive)
+	{
+		this.interactive = interactive;
+	}
+	
+	public S withInteractive(final Boolean interactive)
+	{
+		this.setInteractive(interactive);
+		return this.self();
+	}
+	
+	public Boolean getBubblingMouseEvents()
+	{
+		return this.bubblingMouseEvents;
+	}
+	
+	public void setBubblingMouseEvents(final Boolean bubblingMouseEvents)
+	{
+		this.bubblingMouseEvents = bubblingMouseEvents;
+	}
+	
+	public S withBubblingMouseEvents(final Boolean bubblingMouseEvents)
+	{
+		this.setBubblingMouseEvents(bubblingMouseEvents);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..84f62493
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayer.java
@@ -0,0 +1,257 @@
+/*
+ * 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.layer;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.base.LBaseComponent;
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+import software.xdev.vaadin.maps.leaflet.base.LEvented;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LPopup;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LPopupOptions;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LTooltip;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LTooltipOptions;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#layer">Leaflet docs</a>
+ */
+public abstract class LLayer<S extends LLayer<S>> extends LBaseComponent<S> implements LEvented<S>
+{
+	protected LLayer(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+	
+	// region Add/Remove
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-addto">Leaflet docs</a>
+	 */
+	protected S addTo(final LComponent<?> lComponent)
+	{
+		this.invokeSelf(".addTo(" + lComponent.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-addto">Leaflet docs</a>
+	 */
+	public S addTo(final LMap map)
+	{
+		return this.addTo((LComponent<?>)map);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-addto">Leaflet docs</a>
+	 */
+	public S addTo(final LLayerGroup layerGroup)
+	{
+		return this.addTo((LComponent<?>)layerGroup);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-remove">Leaflet docs</a>
+	 */
+	public S remove()
+	{
+		this.invokeSelf(".remove()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-removefrom">Leaflet docs</a>
+	 */
+	protected S removeFrom(final LComponent<?> lComponent)
+	{
+		this.invokeSelf(".removeFrom(" + lComponent.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-removefrom">Leaflet docs</a>
+	 */
+	public S removeFrom(final LMap map)
+	{
+		return this.removeFrom((LComponent<?>)map);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-removefrom">Leaflet docs</a>
+	 */
+	public S removeFrom(final LLayerGroup layerGroup)
+	{
+		return this.removeFrom((LComponent<?>)layerGroup);
+	}
+	
+	// endregion
+	// region Popup
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-bindpopup">Leaflet docs</a>
+	 */
+	public S bindPopup(final String content, final LPopupOptions options)
+	{
+		this.invokeSelf(
+			".bindPopup($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",
+			content);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-bindpopup">Leaflet docs</a>
+	 */
+	public S bindPopup(final String content)
+	{
+		return this.bindPopup(content, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-bindpopup">Leaflet docs</a>
+	 */
+	public S bindPopup(final LPopup popup)
+	{
+		this.invokeSelf(".bindPopup(" + popup.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-unbindpopup">Leaflet docs</a>
+	 */
+	public S unbindPopup()
+	{
+		this.invokeSelf(".unbindPopup()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-togglepopup">Leaflet docs</a>
+	 */
+	public S togglePopup()
+	{
+		this.invokeSelf(".togglePopup()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-openpopup">Leaflet docs</a>
+	 */
+	public S openPopup(final LLatLng latLng)
+	{
+		this.invokeSelf(".openPopup(" + (latLng != null ? latLng.clientComponentJsAccessor() : "") + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-openpopup">Leaflet docs</a>
+	 */
+	public S openPopup()
+	{
+		return this.openPopup(null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-closepopup">Leaflet docs</a>
+	 */
+	public S closePopup()
+	{
+		this.invokeSelf(".closePopup()");
+		return this.self();
+	}
+	
+	// endregion
+	// region Tooltip
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-bindtooltip">Leaflet docs</a>
+	 */
+	public S bindTooltip(final String content, final LTooltipOptions options)
+	{
+		this.invokeSelf(
+			".bindTooltip($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",
+			content);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-bindtooltip">Leaflet docs</a>
+	 */
+	public S bindTooltip(final String content)
+	{
+		return this.bindTooltip(content, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-bindtooltip">Leaflet docs</a>
+	 */
+	public S bindTooltip(final LTooltip tooltip)
+	{
+		this.invokeSelf(".bindTooltip(" + tooltip.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-unbindtooltip">Leaflet docs</a>
+	 */
+	public S unbindTooltip()
+	{
+		this.invokeSelf(".unbindTooltip()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-toggletooltip">Leaflet docs</a>
+	 */
+	public S toggleTooltip()
+	{
+		this.invokeSelf(".toggleTooltip()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-opentooltip">Leaflet docs</a>
+	 */
+	public S openTooltip(final LLatLng latLng)
+	{
+		this.invokeSelf(".openTooltip(" + (latLng != null ? latLng.clientComponentJsAccessor() : "") + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-opentooltip">Leaflet docs</a>
+	 */
+	public S openTooltip()
+	{
+		return this.openPopup(null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layer-closetooltip">Leaflet docs</a>
+	 */
+	public S closeTooltip()
+	{
+		this.invokeSelf(".closeTooltip()");
+		return this.self();
+	}
+	
+	// endregion
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayerGroup.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayerGroup.java
new file mode 100644
index 00000000..f79cab75
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayerGroup.java
@@ -0,0 +1,84 @@
+/*
+ * 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.layer;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import software.xdev.vaadin.maps.leaflet.base.has.LHasSetZIndex;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#layergroup">Leaflet docs</a>
+ */
+public class LLayerGroup extends LLayer<LLayerGroup> implements LHasSetZIndex<LLayerGroup>
+{
+	public LLayerGroup(
+		final LComponentManagementRegistry compReg,
+		final LLayer<?>[] layers,
+		final LLayerOptions<?>[] options)
+	{
+		super(
+			compReg,
+			"L.layerGroup("
+				+ (layers != null
+				? "[" + Stream.of(layers)
+				.map(LLayer::clientComponentJsAccessor)
+				.collect(Collectors.joining(",")) + "]"
+				: "")
+				+ (options != null
+				? ", [" + Stream.of(options)
+				.map(compReg::writeOptionsOrEmptyObject)
+				.collect(Collectors.joining(",")) + "]"
+				: "")
+				+ ")");
+	}
+	
+	public LLayerGroup(
+		final LComponentManagementRegistry compReg,
+		final LLayer<?>... layers)
+	{
+		this(compReg, layers, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layergroup-addlayer">Leaflet docs</a>
+	 */
+	public LLayerGroup addLayer(final LLayer<?> layer)
+	{
+		this.invokeSelf(".addLayer(" + layer.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layergroup-removelayer">Leaflet docs</a>
+	 */
+	public LLayerGroup removeLayer(final LLayer<?> layer)
+	{
+		this.invokeSelf(".removeLayer(" + layer.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#layergroup-clearlayers">Leaflet docs</a>
+	 */
+	public LLayerGroup clearLayers()
+	{
+		this.invokeSelf(".clearLayers()");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayerOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayerOptions.java
new file mode 100644
index 00000000..1b1bf1ba
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayerOptions.java
@@ -0,0 +1,60 @@
+/*
+ * 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.layer;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#layer-option">Leaflet docs</a>
+ */
+public abstract class LLayerOptions<S extends LLayerOptions<S>> implements LComponentOptions<S>
+{
+	String pane;
+	String attribution;
+	
+	public String getPane()
+	{
+		return this.pane;
+	}
+	
+	public void setPane(final String pane)
+	{
+		this.pane = pane;
+	}
+	
+	public S withPane(final String pane)
+	{
+		this.setPane(pane);
+		return this.self();
+	}
+	
+	public String getAttribution()
+	{
+		return this.attribution;
+	}
+	
+	public void setAttribution(final String attribution)
+	{
+		this.attribution = attribution;
+	}
+	
+	public S withAttribution(final String attribution)
+	{
+		this.setAttribution(attribution);
+		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
new file mode 100644
index 00000000..ceeb1a6f
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlay.java
@@ -0,0 +1,71 @@
+/*
+ * 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.layer.raster;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.base.has.LHasBringTo;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasOpacity;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.layer.LInteractiveLayer;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#imageoverlay">Leaflet docs</a>
+ */
+public class LImageOverlay extends LInteractiveLayer<LImageOverlay>
+	implements LHasBringTo<LImageOverlay>, LHasOpacity<LImageOverlay>
+{
+	protected LImageOverlay(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+	
+	public LImageOverlay(
+		final LComponentManagementRegistry compReg,
+		final String imageUrl,
+		final LLatLngBounds bounds,
+		final LImageOverlayOptions options)
+	{
+		super(
+			compReg,
+			"L.imageOverlay($0, "
+				+ bounds.clientComponentJsAccessor()
+				+ compReg.writeOptionsOptionalNextParameter(options) + ")",
+			imageUrl);
+	}
+	
+	public LImageOverlay(
+		final LComponentManagementRegistry compReg,
+		final String imageUrl,
+		final LLatLngBounds bounds)
+	{
+		this(compReg, imageUrl, bounds, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#imageoverlay-setbounds">Leaflet docs</a>
+	 */
+	public LImageOverlay setBounds(final LLatLngBounds bounds)
+	{
+		this.invokeSelf(".setBounds(" + bounds.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlayOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlayOptions.java
new file mode 100644
index 00000000..859043eb
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlayOptions.java
@@ -0,0 +1,26 @@
+/*
+ * 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.layer.raster;
+
+import software.xdev.vaadin.maps.leaflet.layer.LAbstractImageOverlayOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#imageoverlay">Leaflet docs</a>
+ */
+public class LImageOverlayOptions extends LAbstractImageOverlayOptions<LImageOverlayOptions>
+{
+}
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
new file mode 100644
index 00000000..0dcb8300
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayer.java
@@ -0,0 +1,73 @@
+/*
+ * 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.layer.raster;
+
+import software.xdev.vaadin.maps.leaflet.layer.LGridLayer;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * Represents a <a href="https://leafletjs.com/reference.html#tilelayer">tile layer</a>.
+ * <p/>
+ * <b>Important</b>
+ * <ul>
+ *     <li>Before using tile servers check their usage policies</li>
+ *     <li>If the server is funded by donations consider donating</li>
+ * </ul>
+ *
+ * @see <a href="https://wiki.openstreetmap.org/wiki/Raster_tile_providers">List of raster tile providers</a>
+ */
+public class LTileLayer extends LGridLayer<LTileLayer>
+{
+	public LTileLayer(
+		final LComponentManagementRegistry compReg,
+		final String urlTemplate)
+	{
+		this(compReg, urlTemplate, null);
+	}
+	
+	public LTileLayer(
+		final LComponentManagementRegistry compReg,
+		final String urlTemplate,
+		final LTileLayerOptions options)
+	{
+		super(compReg, "L.tileLayer($0" + compReg.writeOptionsOptionalNextParameter(options) + ")", urlTemplate);
+	}
+	
+	public LTileLayer(
+		final LComponentManagementRegistry compReg,
+		final String urlTemplate,
+		final int maxZoom,
+		final String attribution)
+	{
+		this(compReg, urlTemplate, new LTileLayerOptions().withMaxZoom(maxZoom).withAttribution(attribution));
+	}
+	
+	/**
+	 * Use OpenStreetMap's tile server <br/>
+	 * <b>Important: By using this you accept the <a href="https://operations.osmfoundation.org/policies/tiles/">Usage Policy</a></b>
+	 */
+	@SuppressWarnings("checkstyle:MagicNumber") // Default max Zoom
+	public static LTileLayer createDefaultForOpenStreetMapTileServer(final LComponentManagementRegistry compReg)
+	{
+		return new LTileLayer(
+			compReg,
+			"https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+			19,
+			"© <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
+		);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayerOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayerOptions.java
new file mode 100644
index 00000000..4e559322
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayerOptions.java
@@ -0,0 +1,165 @@
+/*
+ * 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.layer.raster;
+
+import software.xdev.vaadin.maps.leaflet.layer.LGridLayerOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#tilelayer-option">Leaflet docs</a>
+ */
+public class LTileLayerOptions extends LGridLayerOptions<LTileLayerOptions>
+{
+	// String|String[]
+	private Object subdomains;
+	private String errorTileUrl;
+	private Integer zoomOffset;
+	private Boolean tms;
+	private Boolean zoomReverse;
+	private Boolean detectRetina;
+	// Boolean|String
+	private Object crossOrigin;
+	// Boolean|String
+	private Object referrerPolicy;
+	
+	public Object getSubdomains()
+	{
+		return this.subdomains;
+	}
+	
+	public void setSubdomains(final Object subdomains)
+	{
+		this.subdomains = subdomains;
+	}
+	
+	public LTileLayerOptions withSubdomains(final Object subdomains)
+	{
+		this.setSubdomains(subdomains);
+		return this.self();
+	}
+	
+	public String getErrorTileUrl()
+	{
+		return this.errorTileUrl;
+	}
+	
+	public void setErrorTileUrl(final String errorTileUrl)
+	{
+		this.errorTileUrl = errorTileUrl;
+	}
+	
+	public LTileLayerOptions withErrorTileUrl(final String errorTileUrl)
+	{
+		this.setErrorTileUrl(errorTileUrl);
+		return this.self();
+	}
+	
+	public Integer getZoomOffset()
+	{
+		return this.zoomOffset;
+	}
+	
+	public void setZoomOffset(final Integer zoomOffset)
+	{
+		this.zoomOffset = zoomOffset;
+	}
+	
+	public LTileLayerOptions withZoomOffset(final Integer zoomOffset)
+	{
+		this.setZoomOffset(zoomOffset);
+		return this.self();
+	}
+	
+	public Boolean getTms()
+	{
+		return this.tms;
+	}
+	
+	public void setTms(final Boolean tms)
+	{
+		this.tms = tms;
+	}
+	
+	public LTileLayerOptions withTms(final Boolean tms)
+	{
+		this.setTms(tms);
+		return this.self();
+	}
+	
+	public Boolean getZoomReverse()
+	{
+		return this.zoomReverse;
+	}
+	
+	public void setZoomReverse(final Boolean zoomReverse)
+	{
+		this.zoomReverse = zoomReverse;
+	}
+	
+	public LTileLayerOptions withZoomReverse(final Boolean zoomReverse)
+	{
+		this.setZoomReverse(zoomReverse);
+		return this.self();
+	}
+	
+	public Boolean getDetectRetina()
+	{
+		return this.detectRetina;
+	}
+	
+	public void setDetectRetina(final Boolean detectRetina)
+	{
+		this.detectRetina = detectRetina;
+	}
+	public LTileLayerOptions withDetectRetina(final Boolean detectRetina)
+	{
+		this.setDetectRetina(detectRetina);
+		return this.self();
+	}
+	
+	
+	public Object getCrossOrigin()
+	{
+		return this.crossOrigin;
+	}
+	
+	public void setCrossOrigin(final Object crossOrigin)
+	{
+		this.crossOrigin = crossOrigin;
+	}
+	
+	public LTileLayerOptions withCrossOrigin(final Object crossOrigin)
+	{
+		this.setCrossOrigin(crossOrigin);
+		return this.self();
+	}
+	
+	public Object getReferrerPolicy()
+	{
+		return this.referrerPolicy;
+	}
+	
+	public void setReferrerPolicy(final Object referrerPolicy)
+	{
+		this.referrerPolicy = referrerPolicy;
+	}
+	
+	public LTileLayerOptions withReferrerPolicy(final Object referrerPolicy)
+	{
+		this.setReferrerPolicy(referrerPolicy);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..d4182c51
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlay.java
@@ -0,0 +1,49 @@
+/*
+ * 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.layer.raster;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#videooverlay">Leaflet docs</a>
+ */
+public class LVideoOverlay extends LImageOverlay
+{
+	public LVideoOverlay(
+		final LComponentManagementRegistry compReg,
+		final String video,
+		final LLatLngBounds bounds,
+		final LVideoOverlayOptions options)
+	{
+		super(compReg,
+			"L.videoOverlay($0, "
+				+ bounds.clientComponentJsAccessor()
+				+ compReg.writeOptionsOptionalNextParameter(options)
+				+ ")",
+			video);
+	}
+	
+	public LVideoOverlay(
+		final LComponentManagementRegistry compReg,
+		final String video,
+		final LLatLngBounds bounds)
+	{
+		this(compReg, video, bounds, null);
+	}
+	
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlayOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlayOptions.java
new file mode 100644
index 00000000..1bb169a3
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlayOptions.java
@@ -0,0 +1,111 @@
+/*
+ * 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.layer.raster;
+
+import software.xdev.vaadin.maps.leaflet.layer.LAbstractImageOverlayOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#videooverlay">Leaflet docs</a>
+ */
+public class LVideoOverlayOptions extends LAbstractImageOverlayOptions<LVideoOverlayOptions>
+{
+	private Boolean autoplay;
+	private Boolean loop;
+	private Boolean keepAspectRatio;
+	private Boolean muted;
+	private Boolean playsInline;
+	
+	public Boolean getAutoplay()
+	{
+		return this.autoplay;
+	}
+	
+	public void setAutoplay(final Boolean autoplay)
+	{
+		this.autoplay = autoplay;
+	}
+	
+	public LVideoOverlayOptions withAutoplay(final Boolean autoplay)
+	{
+		this.setAutoplay(autoplay);
+		return this.self();
+	}
+	
+	public Boolean getLoop()
+	{
+		return this.loop;
+	}
+	
+	public void setLoop(final Boolean loop)
+	{
+		this.loop = loop;
+	}
+	
+	public LVideoOverlayOptions withLoop(final Boolean loop)
+	{
+		this.setLoop(loop);
+		return this.self();
+	}
+	
+	public Boolean getKeepAspectRatio()
+	{
+		return this.keepAspectRatio;
+	}
+	
+	public void setKeepAspectRatio(final Boolean keepAspectRatio)
+	{
+		this.keepAspectRatio = keepAspectRatio;
+	}
+	
+	public LVideoOverlayOptions withKeepAspectRatio(final Boolean keepAspectRatio)
+	{
+		this.setKeepAspectRatio(keepAspectRatio);
+		return this.self();
+	}
+	
+	public Boolean getMuted()
+	{
+		return this.muted;
+	}
+	
+	public void setMuted(final Boolean muted)
+	{
+		this.muted = muted;
+	}
+	
+	public LVideoOverlayOptions withMuted(final Boolean muted)
+	{
+		this.setMuted(muted);
+		return this.self();
+	}
+	
+	public Boolean getPlaysInline()
+	{
+		return this.playsInline;
+	}
+	
+	public void setPlaysInline(final Boolean playsInline)
+	{
+		this.playsInline = playsInline;
+	}
+	
+	public LVideoOverlayOptions withPlaysInline(final Boolean playsInline)
+	{
+		this.setPlaysInline(playsInline);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LDivOverlay.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LDivOverlay.java
new file mode 100644
index 00000000..8537c6d9
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LDivOverlay.java
@@ -0,0 +1,104 @@
+/*
+ * 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.layer.ui;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasBringTo;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasSetLatLng;
+import software.xdev.vaadin.maps.leaflet.layer.LInteractiveLayer;
+import software.xdev.vaadin.maps.leaflet.layer.LLayer;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#divoverlay">Leaflet docs</a>
+ */
+public abstract class LDivOverlay<S extends LDivOverlay<S>> extends LInteractiveLayer<S>
+	implements LHasBringTo<S>, LHasSetLatLng<S>
+{
+	protected LDivOverlay(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#divoverlay-openon">Leaflet docs</a>
+	 */
+	public S openOn(final LMap map)
+	{
+		this.invokeSelf(".openOn(" + map.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#divoverlay-close">Leaflet docs</a>
+	 */
+	public S close()
+	{
+		this.invokeSelf(".close()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#divoverlay-toggle">Leaflet docs</a>
+	 */
+	public S toggle(final LLayer<?> layer)
+	{
+		this.invokeSelf(".toggle(" + (layer != null ? layer.clientComponentJsAccessor() : "") + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#divoverlay-toggle">Leaflet docs</a>
+	 */
+	public S toggle()
+	{
+		return this.toggle(null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#divoverlay-setcontent">Leaflet docs</a>
+	 */
+	public S setContent(final String content)
+	{
+		this.invokeSelf(".setContent($0)", content);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#divoverlay-setcontent">Leaflet docs</a>
+	 */
+	public S setContent(final LComponent<?> content)
+	{
+		this.invokeSelf(".setContent($0)", content.clientComponentJsAccessor());
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#divoverlay-update">Leaflet docs</a>
+	 */
+	public S update()
+	{
+		this.invokeSelf(".update()");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LDivOverlayOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LDivOverlayOptions.java
new file mode 100644
index 00000000..5321dbea
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LDivOverlayOptions.java
@@ -0,0 +1,77 @@
+/*
+ * 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.layer.ui;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LPoint;
+import software.xdev.vaadin.maps.leaflet.layer.LInteractiveLayerOptions;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#divoverlay-option">Leaflet docs</a>
+ */
+public abstract class LDivOverlayOptions<S extends LDivOverlayOptions<S>> extends LInteractiveLayerOptions<S>
+{
+	private LPoint offset;
+	private String className;
+	private Object content;
+	
+	public LPoint getOffset()
+	{
+		return this.offset;
+	}
+	
+	public void setOffset(final LPoint offset)
+	{
+		this.offset = offset;
+	}
+	
+	public S withOffset(final LPoint offset)
+	{
+		this.setOffset(offset);
+		return this.self();
+	}
+	
+	public String getClassName()
+	{
+		return this.className;
+	}
+	
+	public void setClassName(final String className)
+	{
+		this.className = className;
+	}
+	
+	public S withClassName(final String className)
+	{
+		this.setClassName(className);
+		return this.self();
+	}
+	
+	public Object getContent()
+	{
+		return this.content;
+	}
+	
+	public void setContent(final Object content)
+	{
+		this.content = content;
+	}
+	
+	public S withContent(final Object content)
+	{
+		this.setContent(content);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..ef6e972b
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarker.java
@@ -0,0 +1,69 @@
+/*
+ * 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.layer.ui;
+
+import software.xdev.vaadin.maps.leaflet.base.has.LHasOpacity;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasSetLatLng;
+import software.xdev.vaadin.maps.leaflet.basictypes.LIcon;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.layer.LInteractiveLayer;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#marker">Leaflet docs</a>
+ */
+public class LMarker extends LInteractiveLayer<LMarker>
+	implements LHasSetLatLng<LMarker>, LHasOpacity<LMarker>
+{
+	public LMarker(
+		final LComponentManagementRegistry componentRegistry,
+		final LLatLng latLng)
+	{
+		this(componentRegistry, latLng, null);
+	}
+	
+	public LMarker(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng,
+		final LMarkerOptions options)
+	{
+		super(
+			compReg,
+			"L.marker("
+				+ compReg.clientComponentJsAccessor(latLng)
+				+ compReg.writeOptionsOptionalNextParameter(options)
+				+ ")");
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#marker-setzindexoffset">Leaflet docs</a>
+	 */
+	public LMarker setZIndexOffset(final Integer offset)
+	{
+		this.invokeSelf(".setZIndexOffset($0)", offset);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#marker-seticon">Leaflet docs</a>
+	 */
+	public LMarker setIcon(final LIcon icon)
+	{
+		this.invokeSelf(".setIcon(" + icon.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarkerOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarkerOptions.java
new file mode 100644
index 00000000..b3ece837
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarkerOptions.java
@@ -0,0 +1,198 @@
+/*
+ * 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.layer.ui;
+
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LIcon;
+import software.xdev.vaadin.maps.leaflet.layer.LInteractiveLayerOptions;
+
+
+/**
+ * <a href="https://leafletjs.com/reference.html#marker">Leaflet docs</a>
+ */
+public class LMarkerOptions extends LInteractiveLayerOptions<LMarkerOptions>
+{
+	private LIcon icon;
+	private Boolean keyboard;
+	private String title;
+	private String alt;
+	private Integer zIndexOffset;
+	private Double opacity;
+	private Boolean riseOnHover;
+	private Double riseOffset;
+	private String shadowPane;
+	private Boolean autoPanFocus;
+	
+	public LIcon getIcon()
+	{
+		return this.icon;
+	}
+	
+	public void setIcon(final LIcon icon)
+	{
+		this.icon = icon;
+	}
+	
+	public LMarkerOptions withIcon(final LIcon icon)
+	{
+		this.setIcon(icon);
+		return this.self();
+	}
+	
+	public Boolean getKeyboard()
+	{
+		return this.keyboard;
+	}
+	
+	public void setKeyboard(final Boolean keyboard)
+	{
+		this.keyboard = keyboard;
+	}
+	
+	public LMarkerOptions withKeyboard(final Boolean keyboard)
+	{
+		this.setKeyboard(keyboard);
+		return this.self();
+	}
+	
+	public String getTitle()
+	{
+		return this.title;
+	}
+	
+	public void setTitle(final String title)
+	{
+		this.title = title;
+	}
+	
+	public LMarkerOptions withTitle(final String title)
+	{
+		this.setTitle(title);
+		return this.self();
+	}
+	
+	public String getAlt()
+	{
+		return this.alt;
+	}
+	
+	public void setAlt(final String alt)
+	{
+		this.alt = alt;
+	}
+	
+	public LMarkerOptions withAlt(final String alt)
+	{
+		this.setAlt(alt);
+		return this.self();
+	}
+	
+	public Integer getzIndexOffset()
+	{
+		return this.zIndexOffset;
+	}
+	
+	public void setzIndexOffset(final Integer zIndexOffset)
+	{
+		this.zIndexOffset = zIndexOffset;
+	}
+	
+	public LMarkerOptions withzIndexOffset(final Integer zIndexOffset)
+	{
+		this.setzIndexOffset(zIndexOffset);
+		return this.self();
+	}
+	
+	public Double getOpacity()
+	{
+		return this.opacity;
+	}
+	
+	public void setOpacity(final Double opacity)
+	{
+		this.opacity = opacity;
+	}
+	
+	public LMarkerOptions withOpacity(final Double opacity)
+	{
+		this.setOpacity(opacity);
+		return this.self();
+	}
+	
+	public Boolean getRiseOnHover()
+	{
+		return this.riseOnHover;
+	}
+	
+	public void setRiseOnHover(final Boolean riseOnHover)
+	{
+		this.riseOnHover = riseOnHover;
+	}
+	
+	public LMarkerOptions withRiseOnHover(final Boolean riseOnHover)
+	{
+		this.setRiseOnHover(riseOnHover);
+		return this.self();
+	}
+	
+	public Double getRiseOffset()
+	{
+		return this.riseOffset;
+	}
+	
+	public void setRiseOffset(final Double riseOffset)
+	{
+		this.riseOffset = riseOffset;
+	}
+	
+	public LMarkerOptions withRiseOffset(final Double riseOffset)
+	{
+		this.setRiseOffset(riseOffset);
+		return this.self();
+	}
+	
+	public String getShadowPane()
+	{
+		return this.shadowPane;
+	}
+	
+	public void setShadowPane(final String shadowPane)
+	{
+		this.shadowPane = shadowPane;
+	}
+	
+	public LMarkerOptions withShadowPane(final String shadowPane)
+	{
+		this.setShadowPane(shadowPane);
+		return this.self();
+	}
+	
+	public Boolean getAutoPanFocus()
+	{
+		return this.autoPanFocus;
+	}
+	
+	public void setAutoPanFocus(final Boolean autoPanFocus)
+	{
+		this.autoPanFocus = autoPanFocus;
+	}
+	
+	public LMarkerOptions withAutoPanFocus(final Boolean autoPanFocus)
+	{
+		this.setAutoPanFocus(autoPanFocus);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..de041f63
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopup.java
@@ -0,0 +1,65 @@
+/*
+ * 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.layer.ui;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.layer.LLayer;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+public class LPopup extends LDivOverlay<LPopup>
+{
+	public LPopup(
+		final LComponentManagementRegistry compReg,
+		final LPopupOptions options,
+		final LLayer<?> source)
+	{
+		super(compReg, "L.popup("
+			+ compReg.writeOptions(options)
+			+ (source != null ? ", " + source.clientComponentJsAccessor() : "")
+			+ ")");
+	}
+	
+	public LPopup(
+		final LComponentManagementRegistry compReg,
+		final LPopupOptions options)
+	{
+		this(compReg, options, null);
+	}
+	
+	public LPopup(final LComponentManagementRegistry compReg)
+	{
+		super(compReg, "L.popup()");
+	}
+	
+	public LPopup(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng,
+		final LPopupOptions options)
+	{
+		super(compReg, "L.popup("
+			+ latLng.clientComponentJsAccessor()
+			+ compReg.writeOptionsOptionalNextParameter(options)
+			+ ")");
+	}
+	
+	public LPopup(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng)
+	{
+		this(compReg, latLng, null);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopupOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopupOptions.java
new file mode 100644
index 00000000..ef9ed32a
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopupOptions.java
@@ -0,0 +1,210 @@
+/*
+ * 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.layer.ui;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LPoint;
+
+
+public class LPopupOptions extends LDivOverlayOptions<LPopupOptions>
+{
+	private Integer maxWidth;
+	private Integer minWidth;
+	private Boolean autoPan;
+	private LPoint autoPanPaddingTopLeft;
+	private LPoint autoPanPaddingBottomRight;
+	private LPoint autoPanPadding;
+	private Boolean keepInView;
+	private Boolean closeButton;
+	private Boolean autoClose;
+	private Boolean closeOnEscapeKey;
+	private Boolean closeOnClick;
+	
+	public Integer getMaxWidth()
+	{
+		return this.maxWidth;
+	}
+	
+	public void setMaxWidth(final Integer maxWidth)
+	{
+		this.maxWidth = maxWidth;
+	}
+	
+	public LPopupOptions withMaxWidth(final Integer maxWidth)
+	{
+		this.setMaxWidth(maxWidth);
+		return this.self();
+	}
+	
+	public Integer getMinWidth()
+	{
+		return this.minWidth;
+	}
+	
+	public void setMinWidth(final Integer minWidth)
+	{
+		this.minWidth = minWidth;
+	}
+	
+	public LPopupOptions withMinWidth(final Integer minWidth)
+	{
+		this.setMinWidth(minWidth);
+		return this.self();
+	}
+	
+	public Boolean getAutoPan()
+	{
+		return this.autoPan;
+	}
+	
+	public void setAutoPan(final Boolean autoPan)
+	{
+		this.autoPan = autoPan;
+	}
+	
+	public LPopupOptions withAutoPan(final Boolean autoPan)
+	{
+		this.setAutoPan(autoPan);
+		return this.self();
+	}
+	
+	public LPoint getAutoPanPaddingTopLeft()
+	{
+		return this.autoPanPaddingTopLeft;
+	}
+	
+	public void setAutoPanPaddingTopLeft(final LPoint autoPanPaddingTopLeft)
+	{
+		this.autoPanPaddingTopLeft = autoPanPaddingTopLeft;
+	}
+	
+	public LPopupOptions withAutoPanPaddingTopLeft(final LPoint autoPanPaddingTopLeft)
+	{
+		this.setAutoPanPaddingTopLeft(autoPanPaddingTopLeft);
+		return this.self();
+	}
+	
+	public LPoint getAutoPanPaddingBottomRight()
+	{
+		return this.autoPanPaddingBottomRight;
+	}
+	
+	public void setAutoPanPaddingBottomRight(final LPoint autoPanPaddingBottomRight)
+	{
+		this.autoPanPaddingBottomRight = autoPanPaddingBottomRight;
+	}
+	
+	public LPopupOptions withAutoPanPaddingBottomRight(final LPoint autoPanPaddingBottomRight)
+	{
+		this.setAutoPanPaddingBottomRight(autoPanPaddingBottomRight);
+		return this.self();
+	}
+	
+	public LPoint getAutoPanPadding()
+	{
+		return this.autoPanPadding;
+	}
+	
+	public void setAutoPanPadding(final LPoint autoPanPadding)
+	{
+		this.autoPanPadding = autoPanPadding;
+	}
+	
+	public LPopupOptions withAutoPanPadding(final LPoint autoPanPadding)
+	{
+		this.setAutoPanPadding(autoPanPadding);
+		return this.self();
+	}
+	
+	public Boolean getKeepInView()
+	{
+		return this.keepInView;
+	}
+	
+	public void setKeepInView(final Boolean keepInView)
+	{
+		this.keepInView = keepInView;
+	}
+	
+	public LPopupOptions withKeepInView(final Boolean keepInView)
+	{
+		this.setKeepInView(keepInView);
+		return this.self();
+	}
+	
+	public Boolean getCloseButton()
+	{
+		return this.closeButton;
+	}
+	
+	public void setCloseButton(final Boolean closeButton)
+	{
+		this.closeButton = closeButton;
+	}
+	
+	public LPopupOptions withCloseButton(final Boolean closeButton)
+	{
+		this.setCloseButton(closeButton);
+		return this.self();
+	}
+	
+	public Boolean getAutoClose()
+	{
+		return this.autoClose;
+	}
+	
+	public void setAutoClose(final Boolean autoClose)
+	{
+		this.autoClose = autoClose;
+	}
+	
+	public LPopupOptions withAutoClose(final Boolean autoClose)
+	{
+		this.setAutoClose(autoClose);
+		return this.self();
+	}
+	
+	public Boolean getCloseOnEscapeKey()
+	{
+		return this.closeOnEscapeKey;
+	}
+	
+	public void setCloseOnEscapeKey(final Boolean closeOnEscapeKey)
+	{
+		this.closeOnEscapeKey = closeOnEscapeKey;
+	}
+	
+	public LPopupOptions withCloseOnEscapeKey(final Boolean closeOnEscapeKey)
+	{
+		this.setCloseOnEscapeKey(closeOnEscapeKey);
+		return this.self();
+	}
+	
+	public Boolean getCloseOnClick()
+	{
+		return this.closeOnClick;
+	}
+	
+	public void setCloseOnClick(final Boolean closeOnClick)
+	{
+		this.closeOnClick = closeOnClick;
+	}
+	
+	public LPopupOptions withCloseOnClick(final Boolean closeOnClick)
+	{
+		this.setCloseOnClick(closeOnClick);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..c325f021
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltip.java
@@ -0,0 +1,65 @@
+/*
+ * 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.layer.ui;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.layer.LLayer;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+public class LTooltip extends LDivOverlay<LTooltip>
+{
+	public LTooltip(
+		final LComponentManagementRegistry compReg,
+		final LTooltipOptions options,
+		final LLayer<?> source)
+	{
+		super(compReg, "L.tooltip("
+			+ compReg.writeOptions(options)
+			+ (source != null ? ", " + source.clientComponentJsAccessor() : "")
+			+ ")");
+	}
+	
+	public LTooltip(
+		final LComponentManagementRegistry compReg,
+		final LTooltipOptions options)
+	{
+		this(compReg, options, null);
+	}
+	
+	public LTooltip(final LComponentManagementRegistry compReg)
+	{
+		super(compReg, "L.tooltip()");
+	}
+	
+	public LTooltip(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng,
+		final LTooltipOptions options)
+	{
+		super(compReg, "L.tooltip("
+			+ latLng.clientComponentJsAccessor()
+			+ compReg.writeOptionsOptionalNextParameter(options)
+			+ ")");
+	}
+	
+	public LTooltip(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng)
+	{
+		this(compReg, latLng, null);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltipOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltipOptions.java
new file mode 100644
index 00000000..4e75c558
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltipOptions.java
@@ -0,0 +1,88 @@
+/*
+ * 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.layer.ui;
+
+public class LTooltipOptions extends LDivOverlayOptions<LTooltipOptions>
+{
+	private String direction;
+	private Boolean permanent;
+	private Boolean sticky;
+	private Double opacity;
+	
+	public String getDirection()
+	{
+		return this.direction;
+	}
+	
+	public void setDirection(final String direction)
+	{
+		this.direction = direction;
+	}
+	
+	public LTooltipOptions withDirection(final String direction)
+	{
+		this.setDirection(direction);
+		return this.self();
+	}
+	
+	public Boolean getPermanent()
+	{
+		return this.permanent;
+	}
+	
+	public void setPermanent(final Boolean permanent)
+	{
+		this.permanent = permanent;
+	}
+	
+	public LTooltipOptions withPermanent(final Boolean permanent)
+	{
+		this.setPermanent(permanent);
+		return this.self();
+	}
+	
+	public Boolean getSticky()
+	{
+		return this.sticky;
+	}
+	
+	public void setSticky(final Boolean sticky)
+	{
+		this.sticky = sticky;
+	}
+	
+	public LTooltipOptions withSticky(final Boolean sticky)
+	{
+		this.setSticky(sticky);
+		return this.self();
+	}
+	
+	public Double getOpacity()
+	{
+		return this.opacity;
+	}
+	
+	public void setOpacity(final Double opacity)
+	{
+		this.opacity = opacity;
+	}
+	
+	public LTooltipOptions withOpacity(final Double opacity)
+	{
+		this.setOpacity(opacity);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LAbstractCircle.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LAbstractCircle.java
new file mode 100644
index 00000000..81ae0de1
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LAbstractCircle.java
@@ -0,0 +1,34 @@
+/*
+ * 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.layer.vector;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.base.has.LHasSetLatLng;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+public abstract class LAbstractCircle<S extends LAbstractCircle<S>> extends LPath<S>
+	implements LHasSetLatLng<S>
+{
+	protected LAbstractCircle(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+}
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
new file mode 100644
index 00000000..1a55c0fb
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircle.java
@@ -0,0 +1,54 @@
+/*
+ * 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.layer.vector;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#circle">Leaflet docs</a>
+ */
+public class LCircle extends LAbstractCircle<LCircle>
+{
+	public LCircle(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng,
+		final LCircleOptions options)
+	{
+		super(compReg, "L.circle("
+			+ latLng.clientComponentJsAccessor()
+			+ compReg.writeOptionsOptionalNextParameter(options)
+			+ ")");
+	}
+	
+	public LCircle(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng,
+		final double radius)
+	{
+		this(compReg, latLng, new LCircleOptions().withRadius(radius));
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#circle-setradius">Leaflet docs</a>
+	 */
+	public LCircle setRadius(final Double radius)
+	{
+		this.invokeSelf(".setRadius($0)", radius);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..18bb5055
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarker.java
@@ -0,0 +1,53 @@
+/*
+ * 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.layer.vector;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#circlemarker">Leaflet docs</a>
+ */
+public class LCircleMarker extends LAbstractCircle<LCircleMarker>
+{
+	public LCircleMarker(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng,
+		final LCircleMarkerOptions options)
+	{
+		super(compReg, "L.circleMarker("
+			+ latLng.clientComponentJsAccessor()
+			+ compReg.writeOptionsOptionalNextParameter(options)
+			+ ")");
+	}
+	
+	public LCircleMarker(
+		final LComponentManagementRegistry compReg,
+		final LLatLng latLng)
+	{
+		this(compReg, latLng, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#circlemarker-setradius">Leaflet docs</a>
+	 */
+	public LCircleMarker setRadius(final Integer radius)
+	{
+		this.invokeSelf(".setRadius($0)", radius);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarkerOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarkerOptions.java
new file mode 100644
index 00000000..a10e049d
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarkerOptions.java
@@ -0,0 +1,41 @@
+/*
+ * 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.layer.vector;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#circlemarker">Leaflet docs</a>
+ */
+public class LCircleMarkerOptions extends LPathOptions<LCircleMarkerOptions>
+{
+	private Integer radius;
+	
+	public Integer getRadius()
+	{
+		return this.radius;
+	}
+	
+	public void setRadius(final Integer radius)
+	{
+		this.radius = radius;
+	}
+	
+	public LCircleMarkerOptions withRadius(final Integer radius)
+	{
+		this.setRadius(radius);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleOptions.java
new file mode 100644
index 00000000..ee5c0f2e
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleOptions.java
@@ -0,0 +1,41 @@
+/*
+ * 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.layer.vector;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#circle">Leaflet docs</a>
+ */
+public class LCircleOptions extends LPathOptions<LCircleOptions>
+{
+	private Double radius;
+	
+	public Double getRadius()
+	{
+		return this.radius;
+	}
+	
+	public void setRadius(final Double radius)
+	{
+		this.radius = radius;
+	}
+	
+	public LCircleOptions withRadius(final Double radius)
+	{
+		this.setRadius(radius);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPath.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPath.java
new file mode 100644
index 00000000..b81a62ad
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPath.java
@@ -0,0 +1,48 @@
+/*
+ * 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.layer.vector;
+
+import java.io.Serializable;
+
+import software.xdev.vaadin.maps.leaflet.base.has.LHasBringTo;
+import software.xdev.vaadin.maps.leaflet.base.has.LHasRedraw;
+import software.xdev.vaadin.maps.leaflet.layer.LInteractiveLayer;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#path">Leaflet docs</a>
+ */
+public abstract class LPath<S extends LPath<S>> extends LInteractiveLayer<S>
+	implements LHasBringTo<S>, LHasRedraw<S>
+{
+	protected LPath(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#polyline-setstyle">Leaflet docs</a>
+	 */
+	public S setStyle(final LPathOptions<?> options)
+	{
+		this.invokeSelf(".setStyle(" + this.componentRegistry().writeOptionsOrEmptyObject(options) + ")");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPathOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPathOptions.java
new file mode 100644
index 00000000..596419e9
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPathOptions.java
@@ -0,0 +1,248 @@
+/*
+ * 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.layer.vector;
+
+import software.xdev.vaadin.maps.leaflet.layer.LInteractiveLayerOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#path">Leaflet docs</a>
+ */
+public abstract class LPathOptions<S extends LPathOptions<S>> extends LInteractiveLayerOptions<S>
+{
+	private Boolean stroke;
+	private String color;
+	private Integer weight;
+	private Double opacity;
+	private String lineCap;
+	private String lineJoin;
+	private String dashArray;
+	private String dashOffset;
+	private Boolean fill;
+	private String fillColor;
+	private Double fillOpacity;
+	private String fillRule;
+	// No support for renderer as leaflet automatically selects the best renderer
+	private String className;
+	
+	public Boolean getStroke()
+	{
+		return this.stroke;
+	}
+	
+	public void setStroke(final Boolean stroke)
+	{
+		this.stroke = stroke;
+	}
+	
+	public S withStroke(final Boolean stroke)
+	{
+		this.setStroke(stroke);
+		return this.self();
+	}
+	
+	public String getColor()
+	{
+		return this.color;
+	}
+	
+	public void setColor(final String color)
+	{
+		this.color = color;
+	}
+	
+	public S withColor(final String color)
+	{
+		this.setColor(color);
+		return this.self();
+	}
+	
+	public Integer getWeight()
+	{
+		return this.weight;
+	}
+	
+	public void setWeight(final Integer weight)
+	{
+		this.weight = weight;
+	}
+	
+	public S withWeight(final Integer weight)
+	{
+		this.setWeight(weight);
+		return this.self();
+	}
+	
+	public Double getOpacity()
+	{
+		return this.opacity;
+	}
+	
+	public void setOpacity(final Double opacity)
+	{
+		this.opacity = opacity;
+	}
+	
+	public S withOpacity(final Double opacity)
+	{
+		this.setOpacity(opacity);
+		return this.self();
+	}
+	
+	public String getLineCap()
+	{
+		return this.lineCap;
+	}
+	
+	public void setLineCap(final String lineCap)
+	{
+		this.lineCap = lineCap;
+	}
+	
+	public S withLineCap(final String lineCap)
+	{
+		this.setLineCap(lineCap);
+		return this.self();
+	}
+	
+	public String getLineJoin()
+	{
+		return this.lineJoin;
+	}
+	
+	public void setLineJoin(final String lineJoin)
+	{
+		this.lineJoin = lineJoin;
+	}
+	
+	public S withLineJoin(final String lineJoin)
+	{
+		this.setLineJoin(lineJoin);
+		return this.self();
+	}
+	
+	public String getDashArray()
+	{
+		return this.dashArray;
+	}
+	
+	public void setDashArray(final String dashArray)
+	{
+		this.dashArray = dashArray;
+	}
+	
+	public S withDashArray(final String dashArray)
+	{
+		this.setDashArray(dashArray);
+		return this.self();
+	}
+	
+	public String getDashOffset()
+	{
+		return this.dashOffset;
+	}
+	
+	public void setDashOffset(final String dashOffset)
+	{
+		this.dashOffset = dashOffset;
+	}
+	
+	public S withDashOffset(final String dashOffset)
+	{
+		this.setDashOffset(dashOffset);
+		return this.self();
+	}
+	
+	public Boolean getFill()
+	{
+		return this.fill;
+	}
+	
+	public void setFill(final Boolean fill)
+	{
+		this.fill = fill;
+	}
+	
+	public S withFill(final Boolean fill)
+	{
+		this.setFill(fill);
+		return this.self();
+	}
+	
+	public String getFillColor()
+	{
+		return this.fillColor;
+	}
+	
+	public void setFillColor(final String fillColor)
+	{
+		this.fillColor = fillColor;
+	}
+	
+	public S withFillColor(final String fillColor)
+	{
+		this.setFillColor(fillColor);
+		return this.self();
+	}
+	
+	public Double getFillOpacity()
+	{
+		return this.fillOpacity;
+	}
+	
+	public void setFillOpacity(final Double fillOpacity)
+	{
+		this.fillOpacity = fillOpacity;
+	}
+	
+	public S withFillOpacity(final Double fillOpacity)
+	{
+		this.setFillOpacity(fillOpacity);
+		return this.self();
+	}
+	
+	public String getFillRule()
+	{
+		return this.fillRule;
+	}
+	
+	public void setFillRule(final String fillRule)
+	{
+		this.fillRule = fillRule;
+	}
+	
+	public S withFillRule(final String fillRule)
+	{
+		this.setFillRule(fillRule);
+		return this.self();
+	}
+	
+	public String getClassName()
+	{
+		return this.className;
+	}
+	
+	public void setClassName(final String className)
+	{
+		this.className = className;
+	}
+	
+	public S withClassName(final String className)
+	{
+		this.setClassName(className);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolygon.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolygon.java
new file mode 100644
index 00000000..42b109d1
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolygon.java
@@ -0,0 +1,51 @@
+/*
+ * 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.layer.vector;
+
+import java.util.Collection;
+import java.util.List;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#polygon">Leaflet docs</a>
+ */
+public class LPolygon extends LPolyline
+{
+	public LPolygon(
+		final LComponentManagementRegistry compReg,
+		final Collection<?> latLngs,
+		final LPolylineOptions options)
+	{
+		super(compReg, "L.polygon", latLngs, options);
+	}
+	
+	public LPolygon(
+		final LComponentManagementRegistry compReg,
+		final Collection<?> latLngs)
+	{
+		this(compReg, latLngs, null);
+	}
+	
+	public LPolygon(
+		final LComponentManagementRegistry compReg,
+		final LLatLng... latLngs)
+	{
+		this(compReg, List.of(latLngs), null);
+	}
+}
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
new file mode 100644
index 00000000..23b0f76a
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolyline.java
@@ -0,0 +1,137 @@
+/*
+ * 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.layer.vector;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#polyline">Leaflet docs</a>
+ */
+public class LPolyline extends LPath<LPolyline>
+{
+	protected LPolyline(
+		final LComponentManagementRegistry compReg,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		super(compReg, jsConstructorCallExpression, parameters);
+	}
+	
+	protected LPolyline(
+		final LComponentManagementRegistry compReg,
+		final String constructorMethod,
+		final Collection<?> latLngs,
+		final LPolylineOptions options)
+	{
+		super(compReg, constructorMethod + "("
+			+ convertMultiLatLngs(latLngs)
+			+ compReg.writeOptionsOptionalNextParameter(options)
+			+ ")");
+	}
+	
+	public LPolyline(
+		final LComponentManagementRegistry compReg,
+		final Collection<?> latLngs,
+		final LPolylineOptions options)
+	{
+		this(compReg, "L.polyline", latLngs, options);
+	}
+	
+	public LPolyline(
+		final LComponentManagementRegistry compReg,
+		final Collection<?> latLngs)
+	{
+		this(compReg, latLngs, null);
+	}
+	
+	public LPolyline(
+		final LComponentManagementRegistry compReg,
+		final LLatLng... latLngs)
+	{
+		this(compReg, List.of(latLngs), null);
+	}
+	
+	protected static String convertMultiLatLngs(final Collection<?> latLngsData)
+	{
+		final Object peekedElement = latLngsData.stream().findFirst().orElse(null);
+		if(peekedElement instanceof LLatLng)
+		{
+			return convertLatLngs(latLngsData.stream()
+				.filter(LLatLng.class::isInstance)
+				.map(LLatLng.class::cast)
+				.toList());
+		}
+		
+		return "["
+			+ latLngsData.stream()
+			.filter(Collection.class::isInstance)
+			.map(Collection.class::cast)
+			.map(c -> {
+				if(c.isEmpty())
+				{
+					return "[]";
+				}
+				return convertMultiLatLngs(c);
+			})
+			.collect(Collectors.joining(","))
+			+ "]";
+	}
+	
+	protected static String convertLatLngs(final Collection<LLatLng> latLngs)
+	{
+		return "[" + latLngs.stream().map(LLatLng::clientComponentJsAccessor).collect(Collectors.joining(",")) + "]";
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#polyline-setlatlngs">Leaflet docs</a>
+	 */
+	public LPolyline setLatLngs(final LLatLng... latLngs)
+	{
+		return this.setLatLngs(List.of(latLngs));
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#polyline-setlatlngs">Leaflet docs</a>
+	 */
+	public LPolyline setLatLngs(final Collection<LLatLng> latLngs)
+	{
+		this.invokeSelf(
+			".setLatLngs([" + latLngs.stream().map(LLatLng::clientComponentJsAccessor).collect(Collectors.joining(","))
+				+ "])");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#polyline-addlatlng">Leaflet docs</a>
+	 */
+	public LPolyline addLatLng(final LLatLng latLng, final Collection<LLatLng> latLngs)
+	{
+		this.invokeSelf(".addLatLng("
+			+ latLng.clientComponentJsAccessor()
+			+ (latLngs != null
+			? "," + convertMultiLatLngs(latLngs)
+			: "")
+			+ ")");
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolylineOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolylineOptions.java
new file mode 100644
index 00000000..f0948fa4
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolylineOptions.java
@@ -0,0 +1,54 @@
+/*
+ * 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.layer.vector;
+
+public class LPolylineOptions extends LPathOptions<LPolylineOptions>
+{
+	private Double smoothFactor;
+	private Boolean noClip;
+	
+	public Double getSmoothFactor()
+	{
+		return this.smoothFactor;
+	}
+	
+	public void setSmoothFactor(final Double smoothFactor)
+	{
+		this.smoothFactor = smoothFactor;
+	}
+	
+	public LPolylineOptions withSmoothFactor(final Double smoothFactor)
+	{
+		this.setSmoothFactor(smoothFactor);
+		return this.self();
+	}
+	
+	public Boolean getNoClip()
+	{
+		return this.noClip;
+	}
+	
+	public void setNoClip(final Boolean noClip)
+	{
+		this.noClip = noClip;
+	}
+	
+	public LPolylineOptions withNoClip(final Boolean noClip)
+	{
+		this.setNoClip(noClip);
+		return this.self();
+	}
+}
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
new file mode 100644
index 00000000..0e8de935
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LRectangle.java
@@ -0,0 +1,46 @@
+/*
+ * 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.layer.vector;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#rectangle">Leaflet docs</a>
+ */
+public class LRectangle extends LPolyline
+{
+	public LRectangle(
+		final LComponentManagementRegistry compReg,
+		final LLatLngBounds bounds,
+		final LPolylineOptions options)
+	{
+		super(compReg, "L.rectangle("
+			+ bounds.clientComponentJsAccessor()
+			+ compReg.writeOptionsOptionalNextParameter(options)
+			+ ")");
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#rectangle-setbounds">Leaflet docs</a>
+	 */
+	public LRectangle setBounds(final LLatLngBounds bounds)
+	{
+		this.invokeSelf(".setBounds(" + bounds.clientComponentJsAccessor() + ")");
+		return this;
+	}
+}
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
new file mode 100644
index 00000000..804f83db
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlay.java
@@ -0,0 +1,50 @@
+/*
+ * 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.layer.vector;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LImageOverlay;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LVideoOverlayOptions;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#svgoverlay">Leaflet docs</a>
+ */
+public class LSVGOverlay extends LImageOverlay
+{
+	public LSVGOverlay(
+		final LComponentManagementRegistry compReg,
+		final String svg,
+		final LLatLngBounds bounds,
+		final LVideoOverlayOptions options)
+	{
+		super(compReg,
+			"L.svgOverlay($0, "
+				+ bounds.clientComponentJsAccessor()
+				+ compReg.writeOptionsOptionalNextParameter(options)
+				+ ")",
+			svg);
+	}
+	
+	public LSVGOverlay(
+		final LComponentManagementRegistry compReg,
+		final String video,
+		final LLatLngBounds bounds)
+	{
+		this(compReg, video, bounds, null);
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlayOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlayOptions.java
new file mode 100644
index 00000000..a92821ef
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlayOptions.java
@@ -0,0 +1,26 @@
+/*
+ * 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.layer.vector;
+
+import software.xdev.vaadin.maps.leaflet.layer.LAbstractImageOverlayOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#svgoverlay">Leaflet docs</a>
+ */
+public class LSVGOverlayOptions extends LAbstractImageOverlayOptions<LSVGOverlayOptions>
+{
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/AbstractLMapPanOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/AbstractLMapPanOptions.java
new file mode 100644
index 00000000..bc7e7676
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/AbstractLMapPanOptions.java
@@ -0,0 +1,79 @@
+/*
+ * 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.map;
+
+public class AbstractLMapPanOptions<T extends AbstractLMapPanOptions<T>>
+	implements LMapPanBaseOptions<T>
+{
+	private Boolean animate;
+	private Double duration;
+	private Double easeLinearity;
+	private Boolean noMoveStart;
+	
+	@Override
+	public Boolean getAnimate()
+	{
+		return this.animate;
+	}
+	
+	@Override
+	public void setAnimate(final Boolean animate)
+	{
+		this.animate = animate;
+	}
+	
+	@Override
+	public T withAnimate(final Boolean animate)
+	{
+		return LMapPanBaseOptions.super.withAnimate(animate);
+	}
+	
+	@Override
+	public Double getDuration()
+	{
+		return this.duration;
+	}
+	
+	@Override
+	public void setDuration(final Double duration)
+	{
+		this.duration = duration;
+	}
+	
+	@Override
+	public Double getEaseLinearity()
+	{
+		return this.easeLinearity;
+	}
+	
+	@Override
+	public void setEaseLinearity(final Double easeLinearity)
+	{
+		this.easeLinearity = easeLinearity;
+	}
+	
+	@Override
+	public Boolean getNoMoveStart()
+	{
+		return this.noMoveStart;
+	}
+	
+	@Override
+	public void setNoMoveStart(final Boolean noMoveStart)
+	{
+		this.noMoveStart = noMoveStart;
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/AbstractLMapZoomPanOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/AbstractLMapZoomPanOptions.java
new file mode 100644
index 00000000..213cb174
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/AbstractLMapZoomPanOptions.java
@@ -0,0 +1,27 @@
+/*
+ * 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.map;
+
+public class AbstractLMapZoomPanOptions<T extends AbstractLMapZoomPanOptions<T>>
+	extends AbstractLMapPanOptions<T>
+	implements LMapZoomBaseOptions<T>
+{
+	@Override
+	public T withAnimate(final Boolean animate)
+	{
+		return LMapZoomBaseOptions.super.withAnimate(animate);
+	}
+}
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
new file mode 100644
index 00000000..cda90aee
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMap.java
@@ -0,0 +1,592 @@
+/*
+ * 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.map;
+
+import java.util.UUID;
+
+import com.vaadin.flow.component.html.Div;
+
+import software.xdev.vaadin.maps.leaflet.base.LBaseComponent;
+import software.xdev.vaadin.maps.leaflet.base.LEvented;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.basictypes.LPoint;
+import software.xdev.vaadin.maps.leaflet.controls.LControl;
+import software.xdev.vaadin.maps.leaflet.layer.LLayer;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LPopup;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LTooltip;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#map">Leaflet docs</a>
+ */
+public class LMap extends LBaseComponent<LMap> implements LEvented<LMap>
+{
+	// region Init
+	public LMap(
+		final LComponentManagementRegistry compReg,
+		final String id)
+	{
+		this(compReg, id, null);
+	}
+	
+	public LMap(
+		final LComponentManagementRegistry compReg,
+		final String id,
+		final LMapOptions options)
+	{
+		super(compReg, "L.map($0" + compReg.writeOptionsOptionalNextParameter(options) + ")", id);
+	}
+	
+	public LMap(
+		final LComponentManagementRegistry compReg,
+		final Div bindDiv)
+	{
+		this(compReg, bindDiv, null);
+	}
+	
+	public LMap(
+		final LComponentManagementRegistry compReg,
+		final Div bindDiv,
+		final LMapOptions options)
+	{
+		this(
+			compReg,
+			bindDiv.getId().orElseGet(() -> {
+				final String dynamicId = "map-dynId-" + UUID.randomUUID();
+				bindDiv.setId(dynamicId);
+				return dynamicId;
+			}),
+			options);
+	}
+	
+	/**
+	 * This fixes situations where the leafletmap overlays components like Dialogs
+	 */
+	public static void fixZIndex(final Div div)
+	{
+		div.getStyle().set("z-index", "1");
+	}
+	
+	public void fixInvalidSizeAfterCreation(final String callback)
+	{
+		// https://stackoverflow.com/q/53879753
+		// This should no longer be required starting in Leaflet v2 https://github.com/Leaflet/Leaflet/pull/8612
+		this.componentRegistry().execJs("let tempMap = " + this.clientComponentJsAccessor() + "; "
+			+ "setTimeout(function () { "
+			+ "  tempMap.invalidateSize(false); "
+			+ (callback != null ? callback : "")
+			+ " }, 100)");
+	}
+	
+	// endregion
+	// region Layer/Controls
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-addcontrol">Leaflet docs</a>
+	 */
+	public LMap addControl(final LControl<?> control)
+	{
+		this.invokeSelf(".addControl(" + control.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-removecontrol">Leaflet docs</a>
+	 */
+	public LMap removeControl(final LControl<?> control)
+	{
+		this.invokeSelf(".removeControl(" + control.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-addlayer">Leaflet docs</a>
+	 */
+	public LMap addLayer(final LLayer<?> layer)
+	{
+		this.invokeSelf(".addLayer(" + layer.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-removelayer">Leaflet docs</a>
+	 */
+	public LMap removeLayer(final LLayer<?> layer)
+	{
+		this.invokeSelf(".removeLayer(" + layer.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-openpopup">Leaflet docs</a>
+	 */
+	public LMap openPopup(final LPopup popup)
+	{
+		this.invokeSelf(".openPopup(" + popup.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-closepopup">Leaflet docs</a>
+	 */
+	public LMap closePopup(final LPopup popup)
+	{
+		this.invokeSelf(".closePopup(" + popup.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-closepopup">Leaflet docs</a>
+	 */
+	public LMap closePopup()
+	{
+		this.invokeSelf(".closePopup()");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-opentooltip">Leaflet docs</a>
+	 */
+	public LMap openTooltip(final LTooltip tooltip)
+	{
+		this.invokeSelf(".openTooltip(" + tooltip.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-closetooltip">Leaflet docs</a>
+	 */
+	public LMap closeTooltip(final LTooltip tooltip)
+	{
+		this.invokeSelf(".closeTooltip(" + tooltip.clientComponentJsAccessor() + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-closetooltip">Leaflet docs</a>
+	 */
+	public LMap closeTooltip()
+	{
+		this.invokeSelf(".closeTooltip()");
+		return this.self();
+	}
+	
+	// endregion
+	// region Map state
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setview">Leaflet docs</a>
+	 */
+	public LMap setView(final LLatLng center, final int zoom, final LMapZoomPanOptions options)
+	{
+		this.invokeSelf(".setView("
+			+ center.clientComponentJsAccessor()
+			+ "," + zoom
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+			+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setview">Leaflet docs</a>
+	 */
+	public LMap setView(final LLatLng center, final int zoom)
+	{
+		return this.setView(center, zoom, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-zoomin">Leaflet docs</a>
+	 */
+	public LMap zoomIn(final Integer delta, final LMapZoomOptions options)
+	{
+		this.invokeSelf(".zoomIn("
+			+ (delta != null ? delta : "")
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+			+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-zoomin">Leaflet docs</a>
+	 */
+	public LMap zoomIn(final Integer delta)
+	{
+		return this.zoomIn(delta, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-zoomin">Leaflet docs</a>
+	 */
+	public LMap zoomIn()
+	{
+		return this.zoomIn(null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-zoomout">Leaflet docs</a>
+	 */
+	public LMap zoomOut(final Integer delta, final LMapZoomOptions options)
+	{
+		this.invokeSelf(".zoomOut("
+			+ (delta != null ? delta : "")
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+			+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-zoomout">Leaflet docs</a>
+	 */
+	public LMap zoomOut(final Integer delta)
+	{
+		return this.zoomOut(delta, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-zoomout">Leaflet docs</a>
+	 */
+	public LMap zoomOut()
+	{
+		return this.zoomOut(null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setzoomaround">Leaflet docs</a>
+	 */
+	public LMap setZoomAround(final LLatLng latLng, final int zoom, final LMapZoomOptions options)
+	{
+		this.invokeSelf(
+			".setZoomAround("
+				+ latLng.clientComponentJsAccessor()
+				+ ",$0"
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+				+ ")",
+			zoom);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setzoomaround">Leaflet docs</a>
+	 */
+	public LMap setZoomAround(final LLatLng latLng, final int zoom)
+	{
+		return this.setZoomAround(latLng, zoom, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setzoomaround">Leaflet docs</a>
+	 */
+	public LMap setZoomAround(final LPoint point, final int zoom, final LMapZoomOptions options)
+	{
+		this.invokeSelf(
+			".setZoomAround("
+				+ point.clientComponentJsAccessor()
+				+ ",$0"
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+				+ ")",
+			zoom);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setzoomaround">Leaflet docs</a>
+	 */
+	public LMap setZoomAround(final LPoint point, final int zoom)
+	{
+		return this.setZoomAround(point, zoom, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-fitbounds">Leaflet docs</a>
+	 */
+	public LMap fitBounds(final LLatLngBounds bounds, final LMapFitBoundOptions options)
+	{
+		this.invokeSelf(
+			".fitBounds("
+				+ bounds.clientComponentJsAccessor()
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-fitbounds">Leaflet docs</a>
+	 */
+	public LMap fitBounds(final LLatLngBounds bounds)
+	{
+		return this.fitBounds(bounds, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-fitworld">Leaflet docs</a>
+	 */
+	public LMap fitWorld(final LMapFitBoundOptions options)
+	{
+		this.invokeSelf(
+			".fitWorld("
+				+ this.componentRegistry().writeOptions(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-fitworld">Leaflet docs</a>
+	 */
+	public LMap fitWorld()
+	{
+		return this.fitWorld(null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-panto">Leaflet docs</a>
+	 */
+	public LMap panTo(final LLatLng latLng, final LMapPanOptions options)
+	{
+		this.invokeSelf(
+			".panTo("
+				+ latLng.clientComponentJsAccessor()
+				+ this.componentRegistry().writeOptions(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-panto">Leaflet docs</a>
+	 */
+	public LMap panTo(final LLatLng latLng)
+	{
+		return this.panTo(latLng, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-panby">Leaflet docs</a>
+	 */
+	public LMap panBy(final LPoint offset, final LMapPanOptions options)
+	{
+		this.invokeSelf(
+			".panBy("
+				+ offset.clientComponentJsAccessor()
+				+ this.componentRegistry().writeOptions(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-panby">Leaflet docs</a>
+	 */
+	public LMap panBy(final LPoint offset)
+	{
+		return this.panBy(offset, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-flyto">Leaflet docs</a>
+	 */
+	public LMap flyTo(final LLatLng latLng, final Integer zoom, final LMapZoomPanOptions options)
+	{
+		this.invokeSelf(
+			".flyTo("
+				+ latLng.clientComponentJsAccessor()
+				+ (zoom != null ? "," + zoom : "")
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-flyto">Leaflet docs</a>
+	 */
+	public LMap flyTo(final LLatLng latLng, final Integer zoom)
+	{
+		return this.flyTo(latLng, zoom, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-flyto">Leaflet docs</a>
+	 */
+	public LMap flyTo(final LLatLng latLng)
+	{
+		return this.flyTo(latLng, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-flytobounds">Leaflet docs</a>
+	 */
+	public LMap flyToBounds(final LLatLngBounds bounds, final LMapZoomPanOptions options)
+	{
+		this.invokeSelf(
+			".flyToBounds("
+				+ bounds.clientComponentJsAccessor()
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-flytobounds">Leaflet docs</a>
+	 */
+	public LMap flyToBounds(final LLatLngBounds bounds)
+	{
+		return this.flyToBounds(bounds, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setmaxbounds">Leaflet docs</a>
+	 */
+	public LMap setMaxBounds(final LLatLngBounds bounds)
+	{
+		this.invokeSelf(
+			".setMaxBounds("
+				+ bounds.clientComponentJsAccessor()
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setminzoom">Leaflet docs</a>
+	 */
+	public LMap setMinZoom(final int zoom)
+	{
+		this.invokeSelf(".setMinZoom($0)", zoom);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-setmaxzoom">Leaflet docs</a>
+	 */
+	public LMap setMaxZoom(final int zoom)
+	{
+		this.invokeSelf(".setMaxZoom($0)", zoom);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-paninsidebounds">Leaflet docs</a>
+	 */
+	public LMap panInsideBounds(final LLatLngBounds bounds, final LMapPanOptions options)
+	{
+		this.invokeSelf(
+			".panInsideBounds("
+				+ bounds.clientComponentJsAccessor()
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-paninsidebounds">Leaflet docs</a>
+	 */
+	public LMap panInsideBounds(final LLatLngBounds bounds)
+	{
+		return this.panInsideBounds(bounds, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-paninside">Leaflet docs</a>
+	 */
+	public LMap panInside(final LLatLng latLng, final LMapPanOptions options)
+	{
+		this.invokeSelf(
+			".panInside("
+				+ latLng.clientComponentJsAccessor()
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
+				+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-paninside">Leaflet docs</a>
+	 */
+	public LMap panInside(final LLatLng latLng)
+	{
+		return this.panInside(latLng, null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-invalidatesize">Leaflet docs</a>
+	 */
+	public LMap invalidateSize(final LMapZoomPanOptions options)
+	{
+		this.invokeSelf(".invalidateSize("
+			+ this.componentRegistry().writeOptions(options)
+			+ ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-invalidatesize">Leaflet docs</a>
+	 */
+	public LMap invalidateSize(final boolean animate)
+	{
+		this.invokeSelf(".invalidateSize($0)", animate);
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-stop">Leaflet docs</a>
+	 */
+	public LMap stop()
+	{
+		this.invokeSelf(".stop()");
+		return this.self();
+	}
+	
+	// endregion
+	// region Geolocation
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-locate">Leaflet docs</a>
+	 */
+	public LMap locate(final LMapLocateOptions options)
+	{
+		this.invokeSelf(".locate(" + this.componentRegistry().writeOptions(options) + ")");
+		return this.self();
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-locate">Leaflet docs</a>
+	 */
+	public LMap locate()
+	{
+		return this.locate(null);
+	}
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-stoplocate">Leaflet docs</a>
+	 */
+	public LMap stopLocate()
+	{
+		this.invokeSelf(".stopLocate()");
+		return this.self();
+	}
+	
+	// endregion
+	// region Other
+	
+	/**
+	 * @see <a href="https://leafletjs.com/reference.html#map-remove">Leaflet docs</a>
+	 */
+	public LMap remove()
+	{
+		this.invokeSelf(".remove()");
+		return this.self();
+	}
+	
+	// endregion
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapFitBoundOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapFitBoundOptions.java
new file mode 100644
index 00000000..cf53afec
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapFitBoundOptions.java
@@ -0,0 +1,84 @@
+/*
+ * 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.map;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LPoint;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#fitbounds-options-option">Leaflet docs</a>
+ */
+public class LMapFitBoundOptions extends AbstractLMapZoomPanOptions<LMapFitBoundOptions>
+	implements LMapPaddingBaseOptions<LMapFitBoundOptions>
+{
+	private LPoint paddingTopLeft;
+	private LPoint paddingBottomRight;
+	private LPoint padding;
+	
+	private Integer maxZoom;
+	
+	@Override
+	public LPoint getPaddingTopLeft()
+	{
+		return this.paddingTopLeft;
+	}
+	
+	@Override
+	public void setPaddingTopLeft(final LPoint paddingTopLeft)
+	{
+		this.paddingTopLeft = paddingTopLeft;
+	}
+	
+	@Override
+	public LPoint getPaddingBottomRight()
+	{
+		return this.paddingBottomRight;
+	}
+	
+	@Override
+	public void setPaddingBottomRight(final LPoint paddingBottomRight)
+	{
+		this.paddingBottomRight = paddingBottomRight;
+	}
+	
+	@Override
+	public LPoint getPadding()
+	{
+		return this.padding;
+	}
+	
+	@Override
+	public void setPadding(final LPoint padding)
+	{
+		this.padding = padding;
+	}
+	
+	public Integer getMaxZoom()
+	{
+		return this.maxZoom;
+	}
+	
+	public void setMaxZoom(final Integer maxZoom)
+	{
+		this.maxZoom = maxZoom;
+	}
+	
+	public LMapFitBoundOptions withMaxZoom(final Integer maxZoom)
+	{
+		this.setMaxZoom(maxZoom);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapLocateOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapLocateOptions.java
new file mode 100644
index 00000000..58a1da19
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapLocateOptions.java
@@ -0,0 +1,128 @@
+/*
+ * 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.map;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#locate-options-option">Leaflet docs</a>
+ */
+public class LMapLocateOptions implements LComponentOptions<LMapLocateOptions>
+{
+	private Boolean watch;
+	private Boolean setView;
+	private Integer maxZoom;
+	private Integer timeout;
+	private Integer maximumAge;
+	private Boolean enableHighAccuracy;
+	
+	public Boolean getWatch()
+	{
+		return this.watch;
+	}
+	
+	public void setWatch(final Boolean watch)
+	{
+		this.watch = watch;
+	}
+	
+	public LMapLocateOptions withWatch(final Boolean watch)
+	{
+		this.setWatch(watch);
+		return this.self();
+	}
+	
+	public Boolean getSetView()
+	{
+		return this.setView;
+	}
+	
+	public void setSetView(final Boolean setView)
+	{
+		this.setView = setView;
+	}
+	
+	public LMapLocateOptions withSetView(final Boolean setView)
+	{
+		this.setSetView(setView);
+		return this.self();
+	}
+	
+	public Integer getMaxZoom()
+	{
+		return this.maxZoom;
+	}
+	
+	public void setMaxZoom(final Integer maxZoom)
+	{
+		this.maxZoom = maxZoom;
+	}
+	
+	public LMapLocateOptions withMaxZoom(final Integer maxZoom)
+	{
+		this.setMaxZoom(maxZoom);
+		return this.self();
+	}
+	
+	public Integer getTimeout()
+	{
+		return this.timeout;
+	}
+	
+	public void setTimeout(final Integer timeout)
+	{
+		this.timeout = timeout;
+	}
+	
+	public LMapLocateOptions withTimeout(final Integer timeout)
+	{
+		this.setTimeout(timeout);
+		return this.self();
+	}
+	
+	public Integer getMaximumAge()
+	{
+		return this.maximumAge;
+	}
+	
+	public void setMaximumAge(final Integer maximumAge)
+	{
+		this.maximumAge = maximumAge;
+	}
+	
+	public LMapLocateOptions withMaximumAge(final Integer maximumAge)
+	{
+		this.setMaximumAge(maximumAge);
+		return this.self();
+	}
+	
+	public Boolean getEnableHighAccuracy()
+	{
+		return this.enableHighAccuracy;
+	}
+	
+	public void setEnableHighAccuracy(final Boolean enableHighAccuracy)
+	{
+		this.enableHighAccuracy = enableHighAccuracy;
+	}
+	
+	public LMapLocateOptions withEnableHighAccuracy(final Boolean enableHighAccuracy)
+	{
+		this.setEnableHighAccuracy(enableHighAccuracy);
+		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
new file mode 100644
index 00000000..f80983e9
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapOptions.java
@@ -0,0 +1,668 @@
+/*
+ * 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.map;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLngBounds;
+import software.xdev.vaadin.maps.leaflet.layer.LLayer;
+
+/**
+ * <a href="https://leafletjs.com/reference.html#map-example">Leaflet docs</a>
+ */
+public class LMapOptions implements LComponentOptions<LMapOptions>
+{
+	private Boolean preferCanvas;
+	
+	private Boolean attributionControl;
+	private Boolean zoomControl;
+	
+	private Boolean closePopupOnClick;
+	private Boolean boxZoom;
+	// Boolean|String
+	private Object doubleClickZoom;
+	private Boolean dragging;
+	private Integer zoomSnap;
+	private Integer zoomDelta;
+	private Boolean trackResize;
+	
+	private Boolean inertia;
+	private Integer inertiaDeceleration;
+	private Integer inertiaMaxSpeed;
+	private Double easeLinearity;
+	private Boolean worldCopyJump;
+	private Double maxBoundsViscosity;
+	
+	private Boolean keyboard;
+	private Integer keyboardPanDelta;
+	
+	// Boolean|String
+	private Object scrollWheelZoom;
+	private Integer wheelDebounceTime;
+	private Integer wheelPxPerZoomLevel;
+	
+	private Boolean tapHold;
+	private Integer tapTolerance;
+	// Boolean|String
+	private Object touchZoom;
+	private Boolean bounceAtZoomLimits;
+	
+	private Object crs;
+	private LLatLng center;
+	private Integer zoom;
+	private Integer minZoom;
+	private Integer maxZoom;
+	private LLayer<?>[] layers;
+	private LLatLngBounds maxBounds;
+	
+	private Boolean zoomAnimation;
+	private Integer zoomAnimationThreshold;
+	private Boolean fadeAnimation;
+	private Boolean markerZoomAnimation;
+	private Integer transform3DLimit;
+	
+	public Boolean getPreferCanvas()
+	{
+		return this.preferCanvas;
+	}
+	
+	public void setPreferCanvas(final Boolean preferCanvas)
+	{
+		this.preferCanvas = preferCanvas;
+	}
+	
+	public LMapOptions withPreferCanvas(final Boolean preferCanvas)
+	{
+		this.setPreferCanvas(preferCanvas);
+		return this.self();
+	}
+	
+	public Boolean getAttributionControl()
+	{
+		return this.attributionControl;
+	}
+	
+	public void setAttributionControl(final Boolean attributionControl)
+	{
+		this.attributionControl = attributionControl;
+	}
+	
+	public LMapOptions withAttributionControl(final Boolean attributionControl)
+	{
+		this.setAttributionControl(attributionControl);
+		return this.self();
+	}
+	
+	public Boolean getZoomControl()
+	{
+		return this.zoomControl;
+	}
+	
+	public void setZoomControl(final Boolean zoomControl)
+	{
+		this.zoomControl = zoomControl;
+	}
+	
+	public LMapOptions withZoomControl(final Boolean zoomControl)
+	{
+		this.setZoomControl(zoomControl);
+		return this.self();
+	}
+	
+	public Boolean getClosePopupOnClick()
+	{
+		return this.closePopupOnClick;
+	}
+	
+	public void setClosePopupOnClick(final Boolean closePopupOnClick)
+	{
+		this.closePopupOnClick = closePopupOnClick;
+	}
+	
+	public LMapOptions withClosePopupOnClick(final Boolean closePopupOnClick)
+	{
+		this.setClosePopupOnClick(closePopupOnClick);
+		return this.self();
+	}
+	
+	public Boolean getBoxZoom()
+	{
+		return this.boxZoom;
+	}
+	
+	public void setBoxZoom(final Boolean boxZoom)
+	{
+		this.boxZoom = boxZoom;
+	}
+	
+	public LMapOptions withBoxZoom(final Boolean boxZoom)
+	{
+		this.setBoxZoom(boxZoom);
+		return this.self();
+	}
+	
+	public Object getDoubleClickZoom()
+	{
+		return this.doubleClickZoom;
+	}
+	
+	public void setDoubleClickZoom(final Object doubleClickZoom)
+	{
+		this.doubleClickZoom = doubleClickZoom;
+	}
+	
+	public LMapOptions withDoubleClickZoom(final Object doubleClickZoom)
+	{
+		this.setDoubleClickZoom(doubleClickZoom);
+		return this.self();
+	}
+	
+	public Boolean getDragging()
+	{
+		return this.dragging;
+	}
+	
+	public void setDragging(final Boolean dragging)
+	{
+		this.dragging = dragging;
+	}
+	
+	public LMapOptions withDragging(final Boolean dragging)
+	{
+		this.setDragging(dragging);
+		return this.self();
+	}
+	
+	public Integer getZoomSnap()
+	{
+		return this.zoomSnap;
+	}
+	
+	public void setZoomSnap(final Integer zoomSnap)
+	{
+		this.zoomSnap = zoomSnap;
+	}
+	
+	public LMapOptions withZoomSnap(final Integer zoomSnap)
+	{
+		this.setZoomSnap(zoomSnap);
+		return this.self();
+	}
+	
+	public Integer getZoomDelta()
+	{
+		return this.zoomDelta;
+	}
+	
+	public void setZoomDelta(final Integer zoomDelta)
+	{
+		this.zoomDelta = zoomDelta;
+	}
+	
+	public LMapOptions withZoomDelta(final Integer zoomDelta)
+	{
+		this.setZoomDelta(zoomDelta);
+		return this.self();
+	}
+	
+	public Boolean getTrackResize()
+	{
+		return this.trackResize;
+	}
+	
+	public void setTrackResize(final Boolean trackResize)
+	{
+		this.trackResize = trackResize;
+	}
+	
+	public LMapOptions withTrackResize(final Boolean trackResize)
+	{
+		this.setTrackResize(trackResize);
+		return this.self();
+	}
+	
+	public Boolean getInertia()
+	{
+		return this.inertia;
+	}
+	
+	public void setInertia(final Boolean inertia)
+	{
+		this.inertia = inertia;
+	}
+	
+	public LMapOptions withInertia(final Boolean inertia)
+	{
+		this.setInertia(inertia);
+		return this.self();
+	}
+	
+	public Integer getInertiaDeceleration()
+	{
+		return this.inertiaDeceleration;
+	}
+	
+	public void setInertiaDeceleration(final Integer inertiaDeceleration)
+	{
+		this.inertiaDeceleration = inertiaDeceleration;
+	}
+	
+	public LMapOptions withInertiaDeceleration(final Integer inertiaDeceleration)
+	{
+		this.setInertiaDeceleration(inertiaDeceleration);
+		return this.self();
+	}
+	
+	public Integer getInertiaMaxSpeed()
+	{
+		return this.inertiaMaxSpeed;
+	}
+	
+	public void setInertiaMaxSpeed(final Integer inertiaMaxSpeed)
+	{
+		this.inertiaMaxSpeed = inertiaMaxSpeed;
+	}
+	
+	public LMapOptions withInertiaMaxSpeed(final Integer inertiaMaxSpeed)
+	{
+		this.setInertiaMaxSpeed(inertiaMaxSpeed);
+		return this.self();
+	}
+	
+	public Double getEaseLinearity()
+	{
+		return this.easeLinearity;
+	}
+	
+	public void setEaseLinearity(final Double easeLinearity)
+	{
+		this.easeLinearity = easeLinearity;
+	}
+	
+	public LMapOptions withEaseLinearity(final Double easeLinearity)
+	{
+		this.setEaseLinearity(easeLinearity);
+		return this.self();
+	}
+	
+	public Boolean getWorldCopyJump()
+	{
+		return this.worldCopyJump;
+	}
+	
+	public void setWorldCopyJump(final Boolean worldCopyJump)
+	{
+		this.worldCopyJump = worldCopyJump;
+	}
+	
+	public LMapOptions withWorldCopyJump(final Boolean worldCopyJump)
+	{
+		this.setWorldCopyJump(worldCopyJump);
+		return this.self();
+	}
+	
+	public Double getMaxBoundsViscosity()
+	{
+		return this.maxBoundsViscosity;
+	}
+	
+	public void setMaxBoundsViscosity(final Double maxBoundsViscosity)
+	{
+		this.maxBoundsViscosity = maxBoundsViscosity;
+	}
+	
+	public LMapOptions withMaxBoundsViscosity(final Double maxBoundsViscosity)
+	{
+		this.setMaxBoundsViscosity(maxBoundsViscosity);
+		return this.self();
+	}
+	
+	public Boolean getKeyboard()
+	{
+		return this.keyboard;
+	}
+	
+	public void setKeyboard(final Boolean keyboard)
+	{
+		this.keyboard = keyboard;
+	}
+	
+	public LMapOptions withKeyboard(final Boolean keyboard)
+	{
+		this.setKeyboard(keyboard);
+		return this.self();
+	}
+	
+	public Integer getKeyboardPanDelta()
+	{
+		return this.keyboardPanDelta;
+	}
+	
+	public void setKeyboardPanDelta(final Integer keyboardPanDelta)
+	{
+		this.keyboardPanDelta = keyboardPanDelta;
+	}
+	
+	public LMapOptions withKeyboardPanDelta(final Integer keyboardPanDelta)
+	{
+		this.setKeyboardPanDelta(keyboardPanDelta);
+		return this.self();
+	}
+	
+	public Object getScrollWheelZoom()
+	{
+		return this.scrollWheelZoom;
+	}
+	
+	public void setScrollWheelZoom(final Object scrollWheelZoom)
+	{
+		this.scrollWheelZoom = scrollWheelZoom;
+	}
+	
+	public LMapOptions withScrollWheelZoom(final Object scrollWheelZoom)
+	{
+		this.setScrollWheelZoom(scrollWheelZoom);
+		return this.self();
+	}
+	
+	public Integer getWheelDebounceTime()
+	{
+		return this.wheelDebounceTime;
+	}
+	
+	public void setWheelDebounceTime(final Integer wheelDebounceTime)
+	{
+		this.wheelDebounceTime = wheelDebounceTime;
+	}
+	
+	public LMapOptions withWheelDebounceTime(final Integer wheelDebounceTime)
+	{
+		this.setWheelDebounceTime(wheelDebounceTime);
+		return this.self();
+	}
+	
+	public Integer getWheelPxPerZoomLevel()
+	{
+		return this.wheelPxPerZoomLevel;
+	}
+	
+	public void setWheelPxPerZoomLevel(final Integer wheelPxPerZoomLevel)
+	{
+		this.wheelPxPerZoomLevel = wheelPxPerZoomLevel;
+	}
+	
+	public LMapOptions withWheelPxPerZoomLevel(final Integer wheelPxPerZoomLevel)
+	{
+		this.setWheelPxPerZoomLevel(wheelPxPerZoomLevel);
+		return this.self();
+	}
+	
+	public Boolean getTapHold()
+	{
+		return this.tapHold;
+	}
+	
+	public void setTapHold(final Boolean tapHold)
+	{
+		this.tapHold = tapHold;
+	}
+	
+	public LMapOptions withTapHold(final Boolean tapHold)
+	{
+		this.setTapHold(tapHold);
+		return this.self();
+	}
+	
+	public Integer getTapTolerance()
+	{
+		return this.tapTolerance;
+	}
+	
+	public void setTapTolerance(final Integer tapTolerance)
+	{
+		this.tapTolerance = tapTolerance;
+	}
+	
+	public LMapOptions withTapTolerance(final Integer tapTolerance)
+	{
+		this.setTapTolerance(tapTolerance);
+		return this.self();
+	}
+	
+	public Object getTouchZoom()
+	{
+		return this.touchZoom;
+	}
+	
+	public void setTouchZoom(final Object touchZoom)
+	{
+		this.touchZoom = touchZoom;
+	}
+	
+	public LMapOptions withTouchZoom(final Object touchZoom)
+	{
+		this.setTouchZoom(touchZoom);
+		return this.self();
+	}
+	
+	public Boolean getBounceAtZoomLimits()
+	{
+		return this.bounceAtZoomLimits;
+	}
+	
+	public void setBounceAtZoomLimits(final Boolean bounceAtZoomLimits)
+	{
+		this.bounceAtZoomLimits = bounceAtZoomLimits;
+	}
+	
+	public LMapOptions withBounceAtZoomLimits(final Boolean bounceAtZoomLimits)
+	{
+		this.setBounceAtZoomLimits(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;
+	}
+	
+	public void setCenter(final LLatLng center)
+	{
+		this.center = center;
+	}
+	
+	public LMapOptions withCenter(final LLatLng center)
+	{
+		this.setCenter(center);
+		return this.self();
+	}
+	
+	public Integer getZoom()
+	{
+		return this.zoom;
+	}
+	
+	public void setZoom(final Integer zoom)
+	{
+		this.zoom = zoom;
+	}
+	
+	public LMapOptions withZoom(final Integer zoom)
+	{
+		this.setZoom(zoom);
+		return this.self();
+	}
+	
+	public Integer getMinZoom()
+	{
+		return this.minZoom;
+	}
+	
+	public void setMinZoom(final Integer minZoom)
+	{
+		this.minZoom = minZoom;
+	}
+	
+	public LMapOptions withMinZoom(final Integer minZoom)
+	{
+		this.setMinZoom(minZoom);
+		return this.self();
+	}
+	
+	public Integer getMaxZoom()
+	{
+		return this.maxZoom;
+	}
+	
+	public void setMaxZoom(final Integer maxZoom)
+	{
+		this.maxZoom = maxZoom;
+	}
+	
+	public LMapOptions withMaxZoom(final Integer maxZoom)
+	{
+		this.setMaxZoom(maxZoom);
+		return this.self();
+	}
+	
+	public LLayer<?>[] getLayers()
+	{
+		return this.layers;
+	}
+	
+	public void setLayers(final LLayer<?>[] layers)
+	{
+		this.layers = layers;
+	}
+	
+	public LMapOptions withLayers(final LLayer<?>[] layers)
+	{
+		this.setLayers(layers);
+		return this.self();
+	}
+	
+	public LLatLngBounds getMaxBounds()
+	{
+		return this.maxBounds;
+	}
+	
+	public void setMaxBounds(final LLatLngBounds maxBounds)
+	{
+		this.maxBounds = maxBounds;
+	}
+	
+	public LMapOptions withMaxBounds(final LLatLngBounds maxBounds)
+	{
+		this.setMaxBounds(maxBounds);
+		return this.self();
+	}
+	
+	public Boolean getZoomAnimation()
+	{
+		return this.zoomAnimation;
+	}
+	
+	public void setZoomAnimation(final Boolean zoomAnimation)
+	{
+		this.zoomAnimation = zoomAnimation;
+	}
+	
+	public LMapOptions withZoomAnimation(final Boolean zoomAnimation)
+	{
+		this.setZoomAnimation(zoomAnimation);
+		return this.self();
+	}
+	
+	public Integer getZoomAnimationThreshold()
+	{
+		return this.zoomAnimationThreshold;
+	}
+	
+	public void setZoomAnimationThreshold(final Integer zoomAnimationThreshold)
+	{
+		this.zoomAnimationThreshold = zoomAnimationThreshold;
+	}
+	
+	public LMapOptions withZoomAnimationThreshold(final Integer zoomAnimationThreshold)
+	{
+		this.setZoomAnimationThreshold(zoomAnimationThreshold);
+		return this.self();
+	}
+	
+	public Boolean getFadeAnimation()
+	{
+		return this.fadeAnimation;
+	}
+	
+	public void setFadeAnimation(final Boolean fadeAnimation)
+	{
+		this.fadeAnimation = fadeAnimation;
+	}
+	
+	public LMapOptions withFadeAnimation(final Boolean fadeAnimation)
+	{
+		this.setFadeAnimation(fadeAnimation);
+		return this.self();
+	}
+	
+	public Boolean getMarkerZoomAnimation()
+	{
+		return this.markerZoomAnimation;
+	}
+	
+	public void setMarkerZoomAnimation(final Boolean markerZoomAnimation)
+	{
+		this.markerZoomAnimation = markerZoomAnimation;
+	}
+	
+	public LMapOptions withMarkerZoomAnimation(final Boolean markerZoomAnimation)
+	{
+		this.setMarkerZoomAnimation(markerZoomAnimation);
+		return this.self();
+	}
+	
+	public Integer getTransform3DLimit()
+	{
+		return this.transform3DLimit;
+	}
+	
+	public void setTransform3DLimit(final Integer transform3DLimit)
+	{
+		this.transform3DLimit = transform3DLimit;
+	}
+	
+	public LMapOptions withTransform3DLimit(final Integer transform3DLimit)
+	{
+		this.setTransform3DLimit(transform3DLimit);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPaddingBaseOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPaddingBaseOptions.java
new file mode 100644
index 00000000..c329d4a8
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPaddingBaseOptions.java
@@ -0,0 +1,57 @@
+/*
+ * 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.map;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+import software.xdev.vaadin.maps.leaflet.basictypes.LPoint;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#padding-options">Leaflet docs</a>
+ */
+
+public interface LMapPaddingBaseOptions<S extends LMapPaddingBaseOptions<S>> extends LComponentOptions<S>
+{
+	LPoint getPaddingTopLeft();
+	
+	void setPaddingTopLeft(final LPoint paddingTopLeft);
+	
+	default S withPaddingTopLeft(final LPoint paddingTopLeft)
+	{
+		this.setPaddingTopLeft(paddingTopLeft);
+		return this.self();
+	}
+	
+	LPoint getPaddingBottomRight();
+	
+	void setPaddingBottomRight(final LPoint paddingBottomRight);
+	
+	default S withPaddingBottomRight(final LPoint paddingBottomRight)
+	{
+		this.setPaddingBottomRight(paddingBottomRight);
+		return this.self();
+	}
+	
+	LPoint getPadding();
+	
+	void setPadding(final LPoint padding);
+	
+	default S withPadding(final LPoint padding)
+	{
+		this.setPadding(padding);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPaddingOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPaddingOptions.java
new file mode 100644
index 00000000..269dc678
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPaddingOptions.java
@@ -0,0 +1,65 @@
+/*
+ * 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.map;
+
+import software.xdev.vaadin.maps.leaflet.basictypes.LPoint;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#padding-options">Leaflet docs</a>
+ */
+public class LMapPaddingOptions implements LMapPaddingBaseOptions<LMapPaddingOptions>
+{
+	private LPoint paddingTopLeft;
+	private LPoint paddingBottomRight;
+	private LPoint padding;
+	
+	@Override
+	public LPoint getPaddingTopLeft()
+	{
+		return this.paddingTopLeft;
+	}
+	
+	@Override
+	public void setPaddingTopLeft(final LPoint paddingTopLeft)
+	{
+		this.paddingTopLeft = paddingTopLeft;
+	}
+	
+	@Override
+	public LPoint getPaddingBottomRight()
+	{
+		return this.paddingBottomRight;
+	}
+	
+	@Override
+	public void setPaddingBottomRight(final LPoint paddingBottomRight)
+	{
+		this.paddingBottomRight = paddingBottomRight;
+	}
+	
+	@Override
+	public LPoint getPadding()
+	{
+		return this.padding;
+	}
+	
+	@Override
+	public void setPadding(final LPoint padding)
+	{
+		this.padding = padding;
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPanBaseOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPanBaseOptions.java
new file mode 100644
index 00000000..3e712e40
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPanBaseOptions.java
@@ -0,0 +1,65 @@
+/*
+ * 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.map;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#pan-options">Leaflet docs</a>
+ */
+public interface LMapPanBaseOptions<S extends LMapPanBaseOptions<S>> extends LComponentOptions<S>
+{
+	Boolean getAnimate();
+	
+	void setAnimate(final Boolean animate);
+	
+	default S withAnimate(final Boolean animate)
+	{
+		this.setAnimate(animate);
+		return this.self();
+	}
+	
+	Double getDuration();
+	
+	void setDuration(final Double duration);
+	
+	default S withDuration(final Double duration)
+	{
+		this.setDuration(duration);
+		return this.self();
+	}
+	
+	Double getEaseLinearity();
+	
+	void setEaseLinearity(final Double easeLinearity);
+	
+	default S withEaseLinearity(final Double easeLinearity)
+	{
+		this.setEaseLinearity(easeLinearity);
+		return this.self();
+	}
+	
+	Boolean getNoMoveStart();
+	
+	void setNoMoveStart(final Boolean noMoveStart);
+	
+	default S withNoMoveStart(final Boolean noMoveStart)
+	{
+		this.setNoMoveStart(noMoveStart);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPanOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPanOptions.java
new file mode 100644
index 00000000..ecce21ab
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapPanOptions.java
@@ -0,0 +1,23 @@
+/*
+ * 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.map;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#pan-options">Leaflet docs</a>
+ */
+public class LMapPanOptions extends AbstractLMapPanOptions<LMapPanOptions>
+{
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomBaseOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomBaseOptions.java
new file mode 100644
index 00000000..5827050f
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomBaseOptions.java
@@ -0,0 +1,35 @@
+/*
+ * 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.map;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#zoom-options">Leaflet docs</a>
+ */
+public interface LMapZoomBaseOptions<S extends LMapZoomBaseOptions<S>> extends LComponentOptions<S>
+{
+	Boolean getAnimate();
+	
+	void setAnimate(final Boolean animate);
+	
+	default S withAnimate(final Boolean animate)
+	{
+		this.setAnimate(animate);
+		return this.self();
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomOptions.java
new file mode 100644
index 00000000..80224a2b
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomOptions.java
@@ -0,0 +1,36 @@
+/*
+ * 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.map;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#zoom-options">Leaflet docs</a>
+ */
+public class LMapZoomOptions implements LMapZoomBaseOptions<LMapZoomOptions>
+{
+	private Boolean animate;
+	
+	@Override
+	public Boolean getAnimate()
+	{
+		return this.animate;
+	}
+	
+	@Override
+	public void setAnimate(final Boolean animate)
+	{
+		this.animate = animate;
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomPanOptions.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomPanOptions.java
new file mode 100644
index 00000000..ff9d8ea1
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomPanOptions.java
@@ -0,0 +1,23 @@
+/*
+ * 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.map;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#zoom/pan-options">Leaflet docs</a>
+ */
+public class LMapZoomPanOptions extends AbstractLMapZoomPanOptions<LMapZoomPanOptions>
+{
+}
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
new file mode 100644
index 00000000..3070df03
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LComponentManagementRegistry.java
@@ -0,0 +1,103 @@
+/*
+ * 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.registry;
+
+import java.io.Serializable;
+
+import com.vaadin.flow.component.page.PendingJavaScriptResult;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+
+
+/**
+ * Used for tracking components (on the client).
+ * <p/>
+ * Links components from server (Java) and client (JS) so that they can be reused and/or manipulated after creation.
+ *
+ * @apiNote Manual invocation of these methods is normally not required.<br/>
+ * The only use cases when its required are<br/>
+ * a) when creating a (custom) LComponent<br/>
+ * b) when handling huge amounts of LComponents and needing to freeing up memory on the client side
+ */
+public interface LComponentManagementRegistry
+{
+	// region Write Options
+	String writeOptionsOptionalNextParameter(final LComponentOptions<?> options);
+	
+	String writeOptions(final LComponentOptions<?> options);
+	
+	String writeOptionsOrEmptyObject(final LComponentOptions<?> options);
+	
+	// endregion
+	// region Tracking
+	
+	/**
+	 * Creates the component on the client side and tracks it.
+	 *
+	 * @implNote The component is tracked on the server side inside a {@link java.util.WeakHashMap} which means that
+	 * it's can vanish (get garbage collected) to free up memory - when it's not used otherwise (e.g. in a Variable or
+	 * Lambda). This is a memory-optimization for cases where lots of components are added and removed.
+	 */
+	<C extends LComponent<C>> C add(
+		final C component,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters);
+	
+	/**
+	 * Returns an expression to access the component on the client with JavaScript
+	 */
+	String clientComponentJsAccessor(final LComponent<?> component);
+	
+	/**
+	 * Wrapper for {@link com.vaadin.flow.dom.Element#executeJs(String, Serializable...)}.
+	 * <p/>
+	 * Usage is normally not recommended however there are some corner cases where it's required.
+	 */
+	PendingJavaScriptResult execJs(final String js, final Serializable... params);
+	
+	/**
+	 * Calls {@link #remove(LComponent, boolean)} with <code>freeUpClientWhenNoMatch = true</code>
+	 *
+	 * @see #remove(LComponent, boolean)
+	 */
+	default <C extends LComponent<C>> void remove(final C component)
+	{
+		this.remove(component, true);
+	}
+	
+	/**
+	 * Removes the tracked component from the client.
+	 * <p/>
+	 * If the component can't be found {@link #freeUpClient()} is called when specified.
+	 */
+	<C extends LComponent<C>> void remove(final C component, final boolean freeUpClientWhenNoMatch);
+	
+	/**
+	 * Tries to free up unused components on the client.
+	 *
+	 * @implNote Freeing up is only executed when the server detects that a component on server side vanished (got
+	 * garbage collected). If this is true a full resync of all tracked elements with the client is triggered.
+	 */
+	void freeUpClient();
+	
+	/**
+	 * Clears all tracked elements.
+	 */
+	void clearAll();
+	
+	// endregion
+}
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
new file mode 100644
index 00000000..ab9d464e
--- /dev/null
+++ b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
@@ -0,0 +1,222 @@
+/*
+ * 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.registry;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.WeakHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.HasComponents;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.page.PendingJavaScriptResult;
+
+import software.xdev.vaadin.maps.leaflet.base.LComponent;
+import software.xdev.vaadin.maps.leaflet.base.LComponentOptions;
+import software.xdev.vaadin.maps.leaflet.base.RawString;
+
+
+public class LDefaultComponentManagementRegistry extends Composite<Div> implements LComponentManagementRegistry
+{
+	protected static final AtomicLong NEXT_ID = new AtomicLong(1);
+	
+	protected Map<LComponent<?>, Integer> componentIndexMap = new WeakHashMap<>();
+	protected AtomicInteger nextComponentId = new AtomicInteger(1);
+	protected AtomicInteger clientMapSize = new AtomicInteger(0);
+	
+	protected final ObjectWriter optionsWriter;
+	
+	public LDefaultComponentManagementRegistry(final HasComponents parent)
+	{
+		this(parent, getDefaultWriterForOptions());
+	}
+	
+	public LDefaultComponentManagementRegistry(final HasComponents parent, final ObjectWriter optionsWriter)
+	{
+		this.optionsWriter = Objects.requireNonNull(optionsWriter);
+		
+		this.setId("lComponentRegistry" + NEXT_ID.getAndIncrement());
+		this.getElement().executeJs(this.clientComponents() + " = new Map();");
+		
+		// Make invisible but still be inside dom
+		this.getContent().getElement().setAttribute("hidden", true);
+		// Attach to parent
+		parent.add(this);
+	}
+	
+	@Override
+	public String writeOptionsOptionalNextParameter(final LComponentOptions<?> options)
+	{
+		return options == null ? "" : (", " + this.writeOptionsOrEmptyObject(options));
+	}
+	
+	@Override
+	public String writeOptions(final LComponentOptions<?> options)
+	{
+		return this.writeOptions(options, "");
+	}
+	
+	@Override
+	public String writeOptionsOrEmptyObject(final LComponentOptions<?> options)
+	{
+		return this.writeOptions(options, "{}");
+	}
+	
+	protected String writeOptions(final Object options, final String nullDefault)
+	{
+		if(options == null)
+		{
+			return nullDefault;
+		}
+		try
+		{
+			return this.optionsWriter.writeValueAsString(options);
+		}
+		catch(final JsonProcessingException e)
+		{
+			throw new RuntimeException(e);
+		}
+	}
+	
+	protected String clientComponents()
+	{
+		return "document.getElementById('" + this.getId().orElseThrow() + "').lComponents";
+	}
+	
+	@Override
+	public <C extends LComponent<C>> C add(
+		final C component,
+		final String jsConstructorCallExpression,
+		final Serializable... parameters)
+	{
+		final int currentId = this.nextComponentId.getAndIncrement();
+		this.getElement()
+			.executeJs(
+				this.clientComponents() + ".set(" + currentId + ", " + jsConstructorCallExpression + ");",
+				parameters);
+		this.clientMapSize.incrementAndGet();
+		this.componentIndexMap.put(component, currentId);
+		
+		return component;
+	}
+	
+	@Override
+	public String clientComponentJsAccessor(final LComponent<?> component)
+	{
+		return Optional.ofNullable(this.componentIndexMap.get(component))
+			.map(id -> this.clientComponents() + ".get(" + id + ")")
+			.orElse(null);
+	}
+	
+	@Override
+	public PendingJavaScriptResult execJs(final String js, final Serializable... params)
+	{
+		return this.getElement().executeJs(js, params);
+	}
+	
+	@Override
+	public <C extends LComponent<C>> void remove(final C component, final boolean freeUpClientWhenNoMatch)
+	{
+		final Integer removedId = this.componentIndexMap.remove(component);
+		if(removedId != null)
+		{
+			this.getElement().executeJs(this.clientComponents() + ".delete(" + removedId + ");");
+			this.clientMapSize.decrementAndGet();
+			return;
+		}
+		
+		if(freeUpClientWhenNoMatch)
+		{
+			// Object was maybe already disposed by GC but client may still have it
+			this.freeUpClient();
+		}
+	}
+	
+	@Override
+	public void freeUpClient()
+	{
+		if(this.clientMapSize.get() != this.componentIndexMap.size())
+		{
+			final Collection<Integer> ids = this.componentIndexMap.values();
+			this.getElement().executeJs("""
+				let activeIds = [%s];
+				let components = %s;
+				Array.from(components.keys()).filter(i => !activeIds.includes(i)).forEach(i => components.delete(i));
+				""".formatted(
+				ids.stream().map(String::valueOf).collect(Collectors.joining(",")),
+				this.clientComponents()));
+			this.clientMapSize.set(ids.size());
+		}
+	}
+	
+	@Override
+	public void clearAll()
+	{
+		this.getElement().executeJs(this.clientComponents() + ".clear();");
+		this.clientMapSize.set(0);
+	}
+	
+	protected static ObjectWriter getDefaultWriterForOptions()
+	{
+		return new ObjectMapper()
+			.setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY)
+			.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
+			.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
+			.setVisibility(PropertyAccessor.IS_GETTER, JsonAutoDetect.Visibility.NONE)
+			.setVisibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE)
+			.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.NONE)
+			.registerModule(new SimpleModule()
+				.addSerializer(RawString.class, new RawSerializer<>(RawString::getValue))
+				.addSerializer(LComponent.class, new RawSerializer<>(LComponent::clientComponentJsAccessor)))
+			.writer();
+	}
+	
+	protected static class RawSerializer<V> extends StdSerializer<V>
+	{
+		private final Function<V, String> rawValueExtractor;
+		
+		public RawSerializer(final Function<V, String> rawValueExtractor)
+		{
+			super((Class<V>)null);
+			this.rawValueExtractor = Objects.requireNonNull(rawValueExtractor);
+		}
+		
+		@Override
+		public void serialize(final V value, final JsonGenerator gen, final SerializerProvider provider)
+			throws IOException
+		{
+			gen.writeRawValue(this.rawValueExtractor.apply(value));
+		}
+	}
+}
diff --git a/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/layers-2x.png b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/layers-2x.png
new file mode 100644
index 00000000..200c333d
Binary files /dev/null and b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/layers-2x.png differ
diff --git a/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/layers.png b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/layers.png
new file mode 100644
index 00000000..1a72e578
Binary files /dev/null and b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/layers.png differ
diff --git a/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-icon-2x.png b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-icon-2x.png
new file mode 100644
index 00000000..88f9e501
Binary files /dev/null and b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-icon-2x.png differ
diff --git a/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-icon.png b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-icon.png
new file mode 100644
index 00000000..950edf24
Binary files /dev/null and b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-icon.png differ
diff --git a/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-shadow.png b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-shadow.png
new file mode 100644
index 00000000..9fd29795
Binary files /dev/null and b/vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/marker-shadow.png differ