diff --git a/hermesv3_gr/__init__.py b/hermesv3_gr/__init__.py
index 0309ae290b30bc25e899a6254dc07200c34bc409..9aa3f90365fde8f020d7d8d42193f97c3d0660e1 100755
--- a/hermesv3_gr/__init__.py
+++ b/hermesv3_gr/__init__.py
@@ -1 +1 @@
-__version__ = "2.0.2"
+__version__ = "2.1.0"
diff --git a/hermesv3_gr/modules/emision_inventories/emission_inventory.py b/hermesv3_gr/modules/emision_inventories/emission_inventory.py
index 6519782b52d8ecc1a3e494bad955b42d0ca3fb3f..6a97eff4acfcd231f7573aa9d3a683f0eb83b720 100755
--- a/hermesv3_gr/modules/emision_inventories/emission_inventory.py
+++ b/hermesv3_gr/modules/emision_inventories/emission_inventory.py
@@ -352,7 +352,7 @@ class EmissionInventory(object):
             emission_inventory_path = emission_inventory_path.replace('<input_dir>', options.input_dir)
 
             if emission_inventory.source_type == 'area':
-                if emission_inventory.ei == 'GFASv12':
+                if emission_inventory.ei[:4] == 'GFAS':
                     emission_inventory_list.append(
                         GfasEmissionInventory(
                             comm, options, grid, date, emission_inventory.ei, emission_inventory.source_type,
@@ -379,7 +379,7 @@ class EmissionInventory(object):
                             p_hour=p_hour, p_speciation=emission_inventory.p_speciation,
                             countries_shapefile=countries_shapefile))
             elif emission_inventory.source_type == 'point':
-                if emission_inventory.ei == 'GFASv12':
+                if emission_inventory.ei[:4] == 'GFAS':
                     if emission_inventory.frequency == 'daily':
                         emission_inventory_list.append(
                             PointGfasEmissionInventory(
diff --git a/hermesv3_gr/modules/writing/writer_monarch.py b/hermesv3_gr/modules/writing/writer_monarch.py
index 6a087f4da26682fc9ddf889ddf6149991cfa23db..8598d1a3b5efbdbec38f1ba69feb3d2efd23df1c 100755
--- a/hermesv3_gr/modules/writing/writer_monarch.py
+++ b/hermesv3_gr/modules/writing/writer_monarch.py
@@ -349,36 +349,36 @@ class WriterMonarch(Writer):
             var.coordinates = "lat lon"
             if self.grid.cell_area is not None:
                 var.cell_measures = 'area: cell_area'
-            if RegularLatLon:
-                var.grid_mapping = 'crs'
-            elif Rotated:
-                var.grid_mapping = 'rotated_pole'
-            elif LambertConformalConic:
-                var.grid_mapping = 'Lambert_conformal'
+            # if RegularLatLon:
+            #     var.grid_mapping = 'crs'
+            # elif Rotated:
+            #     var.grid_mapping = 'rotated_pole'
+            # elif LambertConformalConic:
+            #     var.grid_mapping = 'Lambert_conformal'
             settings.write_log("\t\t\t'{0}' variable created with size: {1}".format(var_name, var[:].shape) +
                                "\n\t\t\t\t'{0}' variable will be filled later.".format(var_name), level=3)
 
         settings.write_log("\t\tCreating NetCDF metadata.", level=2)
         # Grid mapping
-        if RegularLatLon:
-            # CRS
-            mapping = netcdf.createVariable('crs', 'i')
-            mapping.grid_mapping_name = "latitude_longitude"
-            mapping.semi_major_axis = 6371000.0
-            mapping.inverse_flattening = 0
-        elif Rotated:
-            # Rotated pole
-            mapping = netcdf.createVariable('rotated_pole', 'c')
-            mapping.grid_mapping_name = 'rotated_latitude_longitude'
-            mapping.grid_north_pole_latitude = 90 - self.grid.new_pole_latitude_degrees
-            mapping.grid_north_pole_longitude = self.grid.new_pole_longitude_degrees
-        elif LambertConformalConic:
-            # CRS
-            mapping = netcdf.createVariable('Lambert_conformal', 'i')
-            mapping.grid_mapping_name = "lambert_conformal_conic"
-            mapping.standard_parallel = "{0}, {1}".format(self.grid.lat_1, self.grid.lat_2)
-            mapping.longitude_of_central_meridian = self.grid.lon_0
-            mapping.latitude_of_projection_origin = self.grid.lat_0
+        # if RegularLatLon:
+        #     # CRS
+        #     mapping = netcdf.createVariable('crs', 'i')
+        #     mapping.grid_mapping_name = "latitude_longitude"
+        #     mapping.semi_major_axis = 6371000.0
+        #     mapping.inverse_flattening = 0
+        # elif Rotated:
+        #     # Rotated pole
+        #     mapping = netcdf.createVariable('rotated_pole', 'c')
+        #     mapping.grid_mapping_name = 'rotated_latitude_longitude'
+        #     mapping.grid_north_pole_latitude = 90 - self.grid.new_pole_latitude_degrees
+        #     mapping.grid_north_pole_longitude = self.grid.new_pole_longitude_degrees
+        # elif LambertConformalConic:
+        #     # CRS
+        #     mapping = netcdf.createVariable('Lambert_conformal', 'i')
+        #     mapping.grid_mapping_name = "lambert_conformal_conic"
+        #     mapping.standard_parallel = "{0}, {1}".format(self.grid.lat_1, self.grid.lat_2)
+        #     mapping.longitude_of_central_meridian = self.grid.lon_0
+        #     mapping.latitude_of_projection_origin = self.grid.lat_0
 
         # Cell area
         if self.grid.cell_area is not None:
@@ -715,12 +715,12 @@ class WriterMonarch(Writer):
 
                 if self.grid.cell_area is not None:
                     var.cell_measures = 'area: cell_area'
-                if regular_latlon:
-                    var.grid_mapping = 'crs'
-                elif rotated:
-                    var.grid_mapping = 'rotated_pole'
-                elif lcc:
-                    var.grid_mapping = 'Lambert_conformal'
+                # if regular_latlon:
+                #     var.grid_mapping = 'crs'
+                # elif rotated:
+                #     var.grid_mapping = 'rotated_pole'
+                # elif lcc:
+                #     var.grid_mapping = 'Lambert_conformal'
 
                 if mpi_numpy:
                     data = np.ones(var[:].shape, dtype=settings.precision) * 100
@@ -761,27 +761,27 @@ class WriterMonarch(Writer):
                 settings.write_log("\t\t\t'{0}' variable created with size: {1}".format(var_name, var[:].shape),
                                    level=3)
         settings.write_log("\t\tCreating NetCDF metadata.", level=2)
-        if settings.rank == 0:
-            # Grid mapping
-            if regular_latlon:
-                # CRS
-                mapping = netcdf.createVariable('crs', 'i')
-                mapping.grid_mapping_name = "latitude_longitude"
-                mapping.semi_major_axis = 6371000.0
-                mapping.inverse_flattening = 0
-            elif rotated:
-                # rotated pole
-                mapping = netcdf.createVariable('rotated_pole', 'c')
-                mapping.grid_mapping_name = 'rotated_latitude_longitude'
-                mapping.grid_north_pole_latitude = 90 - self.grid.new_pole_latitude_degrees
-                mapping.grid_north_pole_longitude = self.grid.new_pole_longitude_degrees
-            elif lcc:
-                # CRS
-                mapping = netcdf.createVariable('Lambert_conformal', 'i')
-                mapping.grid_mapping_name = "lambert_conformal_conic"
-                mapping.standard_parallel = "{0}, {1}".format(self.grid.lat_1, self.grid.lat_2)
-                mapping.longitude_of_central_meridian = self.grid.lon_0
-                mapping.latitude_of_projection_origin = self.grid.lat_0
+        # if settings.rank == 0:
+        #     # Grid mapping
+        #     if regular_latlon:
+        #         # CRS
+        #         mapping = netcdf.createVariable('crs', 'i')
+        #         mapping.grid_mapping_name = "latitude_longitude"
+        #         mapping.semi_major_axis = 6371000.0
+        #         mapping.inverse_flattening = 0
+        #     elif rotated:
+        #         # rotated pole
+        #         mapping = netcdf.createVariable('rotated_pole', 'c')
+        #         mapping.grid_mapping_name = 'rotated_latitude_longitude'
+        #         mapping.grid_north_pole_latitude = 90 - self.grid.new_pole_latitude_degrees
+        #         mapping.grid_north_pole_longitude = self.grid.new_pole_longitude_degrees
+        #     elif lcc:
+        #         # CRS
+        #         mapping = netcdf.createVariable('Lambert_conformal', 'i')
+        #         mapping.grid_mapping_name = "lambert_conformal_conic"
+        #         mapping.standard_parallel = "{0}, {1}".format(self.grid.lat_1, self.grid.lat_2)
+        #         mapping.longitude_of_central_meridian = self.grid.lon_0
+        #         mapping.latitude_of_projection_origin = self.grid.lat_0
 
         if self.grid.cell_area is not None:
             cell_area = settings.comm.gather(self.grid.cell_area, root=0)