diff --git a/apps/map/models.py b/apps/map/models.py
index 5292615..bcf70c6 100644
--- a/apps/map/models.py
+++ b/apps/map/models.py
@@ -593,28 +593,33 @@ class CaseStudy(models.Model):
     )
 
     # 2.2.2
-    energy_storage_capacity = models.IntegerField(
+    energy_storage_capacity = models.DecimalField(
         verbose_name=_("Energy storage capacity"),
-        help_text=_("Enter the total capacity of the energy storage system."),
+        help_text=_("Enter the total capacity of the energy storage system in kilowatt-hours (kWh)."),
+        max_digits=20,
+        decimal_places=3,
         default=None,
         null=True,
         blank=True
     )
 
     # 2.2.2.1
-    maximum_power_output = models.BigIntegerField(
+    maximum_power_output = models.DecimalField(
         verbose_name=_('Maximum power output'),
-        help_text=_('Enter the maximum power output of the storage system in Watts (W). (W=J/s)'),
+        help_text=_('Enter the maximum power output of the storage system in kilowatts (kW).'),
+        max_digits=12,
+        decimal_places=3,
         default=None,
         null=True,
         blank=True
     )
 
     # 2.2.2.2
-    discharge_time = models.BigIntegerField(
+    discharge_time = models.DecimalField(
         verbose_name=_('Time for discharge from full capacity'),
-        help_text=_('Enter the time it takes to discharge from full capacity at maximum power output (in seconds) \
-        (1h=3600s)'),
+        help_text=_('Enter the time it takes to discharge from full capacity at maximum power output (in hours).'),
+        max_digits=6,
+        decimal_places=3,
         default=None,
         null=True,
         blank=True