diff --git a/example/pages/listexample/_detail.vue b/example/pages/listexample/_detail.vue
index efe6cd0e..6d4619d4 100644
--- a/example/pages/listexample/_detail.vue
+++ b/example/pages/listexample/_detail.vue
@@ -208,6 +208,19 @@ export default {
           },
           { label: this.$t("content"), value: "content", type: "editor" },
           { label: "Color", value: "meta.color", synci18n: true, type: "color" },
+          {
+                label: "map",
+                value: "meta.map",
+                type: "map",
+                attrs: {
+                  multiple: true,
+                  fields: [
+                    { value: "store_name", label: "Store name", class: "col-sm-6" },
+                    { value: "contact", label: "Contact", class: "col-sm-6" },
+                  ],
+                },
+                synci18n: true,
+              },
           {
             group: "Seo",
             fields: [
@@ -343,13 +356,6 @@ export default {
           },
         ],
         sidenav: [
-          {
-            label: this.$t("categories"),
-            value: "categories",
-            synci18n: true,
-            type: "m2m",
-            attrs: { endpoint: "api/camomilla/categories", itemText: "title" },
-          },
           {
             group: "Status",
             fields: [
@@ -421,7 +427,6 @@ export default {
             type: "media",
             synci18n: true,
           },
-          { label: "map", value: "meta.map", type: "map", synci18n: true },
         ],
       };
     },
diff --git a/packages/@mapomodule/uikit/components/Form/fields/mapField/mapField.vue b/packages/@mapomodule/uikit/components/Form/fields/mapField/mapField.vue
index fc168433..e8ecfc7d 100644
--- a/packages/@mapomodule/uikit/components/Form/fields/mapField/mapField.vue
+++ b/packages/@mapomodule/uikit/components/Form/fields/mapField/mapField.vue
@@ -1,35 +1,78 @@
 <template>
   <div>
+    <span v-if="label" class="v-label" :class="{'error--text': hasErrors, 'text--secondary': !hasErrors}">{{ label }}:</span>
     <div ref="map" class="map"></div>
     <div class="map-fields">
-      <div class="row input-gap">
-        <div class="col-sm-8">
+      <div class="row search-row">
+        <div class="col-sm-12" style="padding: 0px">
+          <v-text-field
+            v-model="searchQuery"
+            :label="$t('mapo.searchLocation')"
+            @input="debouncedSearchLocation()"
+            v-bind="{ ...$attrs }"
+            class="col"
+          />
+        </div>
+      </div>
+      <div class="row input-gap" style="margin-top: 1rem;" v-for="(point, index) in model" :key="index">
+        <div class="col-sm-12"><v-divider></v-divider></div>
+        <div class="col-sm-6">
           <div class="row">
             <v-text-field
-              v-model="searchQuery"
-              :label="$t('mapo.searchLocation')"
-              @input="debouncedSearchLocation()"
+              v-model="point.pointName"
+              :label="$t('mapo.pointName')"
               v-bind="{ ...$attrs }"
-              class="col"
+              ref="pointName"
             />
           </div>
         </div>
         <div class="col">
-          <div class="row input-gap">
+          <div class="row">
             <v-text-field
-              v-model="lat"
+              v-model="point.lat"
               :label="$t('mapo.latitude')"
               v-bind="{ ...$attrs }"
               readonly
-              class="col-6"
+              class="col-5"
             />
             <v-text-field
-              v-model="lon"
+              v-model="point.lon"
               :label="$t('mapo.longitude')"
               v-bind="{ ...$attrs }"
               readonly
-              class="col"
+              class="col-5"
             />
+            <v-btn
+              v-if="!readonly"
+              @click="removePointFromModel(index)"
+              class="col"
+              icon
+              ><v-icon>mdi-close</v-icon></v-btn
+            >
+          </div>
+        </div>
+        <div class="col-sm-12">
+          <div class="row">
+            <Form
+              v-model="point.extra_fields"
+              :fields="getFields(model.extra_fields)"
+              :errors="getErrors(index)"
+              :readonly="readonly"
+              immediate
+            >
+              <template
+                v-for="(slot, name) in templateSlots(model, $slots)"
+                :slot="slot"
+              >
+                <slot :name="name"></slot>
+              </template>
+              <template
+                v-for="(slot, name) in templateSlots(model, $scopedSlots)"
+                v-slot:[slot]="props"
+              >
+                <slot :name="name" v-bind="props" />
+              </template>
+            </Form>
           </div>
         </div>
       </div>
@@ -50,6 +93,12 @@
 .input-gap {
   gap: 8px;
 }
+.search-row {
+  margin-bottom: 10px;
+  & > div {
+    padding: 0 !important;
+  }
+}
 </style>
 
 <script>
@@ -58,31 +107,53 @@
  */
 import { debounce } from "@mapomodule/utils/helpers/debounce";
 import injectScript from "./leaflet.injector.js";
+import { nameSpacedSlots } from "@mapomodule/utils/helpers/slots";
 
 export default {
   name: "MapField",
+  components: {
+    // For recursive dynamic components is better to resolve dependencies at runtime to avoid circular deps
+    Form: () => import("@mapomodule/uikit/components/Form/Form.vue"),
+  },
   props: {
     // V-model property.
     value: {
-      type: Object,
+      type: Array,
     },
+    // This label will be shown at the top of the editor.
+    label: String,
     // This set the component status to readonly, stopping the user interaction.
     readonly: {
       type: Boolean,
       default: false,
     },
+    // This set the component status to multiple, allowing the user to add multiple points. Pass it into attrs
+    multiple: {
+      type: Boolean,
+      default: false,
+    },
+    fields: {
+      // [`Array<FieldConfiguration>`](/components/Detail/Detail/#fieldconfiguration)
+      type: Array | Object,
+      default: () => [],
+    },
+    // Puts the input in an error state and passes through custom error messages.
+    errorMessages: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
-      model: this.value || {},
+      model: this.value || [],
       map: null,
       searchQuery: "",
-      marker: null,
+      markers: [],
     };
   },
   watch: {
     value(val) {
-      this.model = val || {};
+      this.model = val || [];
     },
     model(val) {
       this.$emit("input", val);
@@ -93,39 +164,84 @@ export default {
   },
   methods: {
     initMap() {
-      const coordinates = this.model;
-      if (coordinates.lat && coordinates.lon) {
-        this.map = L.map(this.$refs.map).setView(
-          [coordinates.lat, coordinates.lon],
-          12
-        );
-        this.removeAllMarkers();
-        this.marker = L.marker([coordinates.lat, coordinates.lon]).addTo(
-          this.map
-        );
+      const coordinates = this.model || [];
+      if (coordinates.length > 0) {
+        const { lat, lon } = coordinates[coordinates.length - 1];
+        this.map = L.map(this.$refs.map).setView([lat, lon], 12);
+        coordinates.forEach((point, index) => {
+          const marker = L.marker([point.lat, point.lon]).addTo(this.map);
+          this.markers[index] = marker;
+        });
+        this.map.fitBounds(coordinates.map((point) => [point.lat, point.lon]));
       } else {
         this.map = L.map(this.$refs.map).setView([0, 0], 2);
       }
-
       L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
         attribution: "© OpenStreetMap contributors",
       }).addTo(this.map);
-
-      this.map.on("click", (event) => {
+      this.handleClickOnMap();
+    },
+    handleClickOnMap() {
+      this.map.on("click", async (event) => {
         const coordinates = event.latlng;
-        this.model = { lat: coordinates.lat, lon: coordinates.lng };
-        this.removeAllMarkers();
-        this.marker = L.marker([coordinates.lat, coordinates.lng]).addTo(
+
+        if (!this.multiple) {
+          this.removeAllMarkers();
+          this.model = [];
+        }
+
+        this.model.push({
+          lat: coordinates.lat,
+          lon: coordinates.lng,
+          pointName: "",
+          extra_fields: {},
+        });
+
+        const marker = L.marker([coordinates.lat, coordinates.lng]).addTo(
           this.map
         );
+        this.markers.push(marker);
+        await this.reverseGeoCoding(coordinates.lat, coordinates.lng);
       });
     },
     removeAllMarkers() {
-      this.map.eachLayer((layer) => {
-        if (layer instanceof L.Marker) {
-          this.map.removeLayer(layer);
+      this.markers.forEach((marker) => this.map.removeLayer(marker));
+      this.markers = [];
+    },
+    async reverseGeoCoding(lat, lon) {
+      const reverseGeocodingResponse = await this.$axios.get(
+        "https://nominatim.openstreetmap.org/reverse",
+        {
+          params: {
+            lat,
+            lon,
+            format: "json",
+            addressdetails: 1,
+            "accept-language": this.$attrs.currentLang || "en",
+          },
         }
-      });
+      );
+
+      if (
+        reverseGeocodingResponse.data &&
+        reverseGeocodingResponse.data.display_name
+      ) {
+        this.model[this.currentIndex].pointName =
+          reverseGeocodingResponse.data.display_name;
+      } else {
+        this.model[this.currentIndex].pointName = this.searchQuery;
+      }
+    },
+    removePointFromModel(index) {
+      this.map.removeLayer(this.markers[index]);
+      this.markers.splice(index, 1);
+      this.model.splice(index, 1);
+
+      if (this.model.length > 0) {
+        this.map.fitBounds(this.model.map((point) => [point.lat, point.lon]));
+      } else {
+        this.map.setView([0, 0], 2);
+      }
     },
     async searchLocation() {
       try {
@@ -141,23 +257,57 @@ export default {
         );
 
         if (response.data.length > 0) {
+          if (!this.multiple) {
+            this.removeAllMarkers();
+            this.model = [];
+          }
           const { lat, lon } = response.data[0];
           this.map.setView([lat, lon], 12);
 
-          if (this.marker) {
-            this.map.removeLayer(this.marker);
-          }
-          this.removeAllMarkers();
-          this.marker = L.marker([lat, lon]).addTo(this.map);
-          this.model = { lat, lon };
+          const marker = L.marker([lat, lon]).addTo(this.map);
+          this.markers.push(marker);
+
+          this.model.push({
+            lat,
+            lon,
+            pointName: this.searchQuery,
+            extra_fields: {},
+          });
+
+          await this.reverseGeoCoding(lat, lon);
+          this.map.fitBounds(this.model.map((point) => [point.lat, point.lon]));
         }
       } catch (error) {
-        console.error("Errore nella ricerca del luogo:", error);
+        console.error(`${this.$t("mapo.error.searchError")}: `, error);
       }
     },
     debouncedSearchLocation: debounce(function () {
       this.searchLocation();
     }, 500),
+    getErrors(index) {
+      return (this.errorMessages[index]) || {};
+    },
+    getFields(model) {
+      if (this.hasTemplates) {
+        const template = this.templates.find(
+          (t) => model[t.tCodeField] == t.tCode
+        );
+        return template ? template.fields : [];
+      }
+      return this.fields;
+    },
+    templateSlots(model, slots) {
+      if (this.hasTemplates) {
+        const template = this.templates.find(
+          (t) => model[t.tCodeField] == t.tCode
+        );
+        return nameSpacedSlots(slots, `template.${template.tCode}.`).reduce(
+          (acc, v) => ({ [`template.${template.tCode}.${v}`]: v, ...acc }),
+          {}
+        );
+      }
+      return Object.keys(slots).reduce((acc, v) => ({ [v]: v, ...acc }), {});
+    },
   },
   computed: {
     lat() {
@@ -166,6 +316,33 @@ export default {
     lon() {
       return this.model?.lon || "";
     },
+    pointName() {
+      return this.model?.pointName || "";
+    },
+    currentIndex() {
+      return this.model.length > 0 ? this.model.length - 1 : 0;
+    },
+    hasTemplates() {
+      return typeof this.fields == "object" && !Array.isArray(this.fields);
+    },
+    templates() {
+      const templates = {};
+      if (this.hasTemplates) {
+        Object.keys(this.fields).forEach((tKey) => {
+          const tValue = this.fields[tKey];
+          const { preview, description } = tValue;
+          templates[tKey] = {
+            fields: tValue.fields || tValue,
+            name: tValue.name || titleCase(tKey.replace(/_/, " ")),
+            tCode: tValue.tCode || tKey,
+            tCodeField: tValue.tCodeField || "tCode",
+            preview,
+            description,
+          };
+        });
+      }
+      return Object.values(templates);
+    },
   },
 };
 </script>
diff --git a/packages/@mapomodule/uikit/translations/en-US.js b/packages/@mapomodule/uikit/translations/en-US.js
index 28659fc4..a3a7cb7e 100644
--- a/packages/@mapomodule/uikit/translations/en-US.js
+++ b/packages/@mapomodule/uikit/translations/en-US.js
@@ -40,10 +40,11 @@ export default {
         altTag: "Alt Tag",
         titleTag: "Title Tag",
         linkedModels: "Linked Models",
+        searchLocation: "Search a location",
         showPreview: "Show preview",
-        searchLocation: "Search location",
         latitude: "Latitude",
         longitude: "Longitude",
+        pointName: "Point name",
 
         // pages/index.vue
         index: {
@@ -51,6 +52,11 @@ export default {
                 "Congratulations!! 🥳 You successfully installed Mapo!",
         },
 
+        //errors
+        error: {
+            searchError: "Error during search",
+        },
+
         // ConfirmDialog.vue
         confirmDialog: {
             areYouSure: "Are you sure of what you are doing?",
diff --git a/packages/@mapomodule/uikit/translations/it-IT.js b/packages/@mapomodule/uikit/translations/it-IT.js
index 5a7c60c1..bd94fff5 100644
--- a/packages/@mapomodule/uikit/translations/it-IT.js
+++ b/packages/@mapomodule/uikit/translations/it-IT.js
@@ -41,10 +41,11 @@ export default {
         altTag: "Alt Tag",
         titleTag: "Title Tag",
         linkedModels: "Modelli collegati",
+        searchLocation: "Cerca un luogo",
         showPreview: "Mostra anteprima",
-        searchLocation: "Cerca luogo",
         latitude: "Latitudine",
         longitude: "Longitudine",
+        pointName: "Nome punto",
 
         // pages/index.vue
         index: {
@@ -52,6 +53,11 @@ export default {
                 "Congratulazioni!! 🥳 Mapo è stato installato correttamente!",
         },
 
+        //errors
+        error: {
+            searchError: "Errore durante la ricerca",
+        },
+
         // ConfirmDialog.vue
         confirmDialog: {
             areYouSure: "Sei sicuro di ciò che vuoi fare?",