diff --git a/src/Model/Geometry/PointXYZ.py b/src/Model/Geometry/PointXYZ.py
index 4c28a07a..af18bf0b 100644
--- a/src/Model/Geometry/PointXYZ.py
+++ b/src/Model/Geometry/PointXYZ.py
@@ -66,6 +66,11 @@ class PointXYZ(Point):
           )
         """)
 
+        execute(
+            "CREATE INDEX idx_point " +
+            "ON geometry_pointXYZ(profile, scenario);"
+        )
+
         return cls._create_submodel(execute)
 
     @classmethod
@@ -90,6 +95,13 @@ class PointXYZ(Point):
                     "ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
                 )
 
+        if major == "0" and minor == "2":
+            if int(release) < 5:
+                execute(
+                    "CREATE INDEX idx_point " +
+                    "ON geometry_pointXYZ(profile, scenario);"
+                )
+
         return cls._update_submodel(execute, version, data)
 
     @classmethod
diff --git a/src/Model/Study.py b/src/Model/Study.py
index 9816dcd4..92028c67 100644
--- a/src/Model/Study.py
+++ b/src/Model/Study.py
@@ -46,7 +46,7 @@ logger = logging.getLogger()
 
 
 class Study(SQLModel):
-    _version = "0.2.4"
+    _version = "0.2.5"
 
     _sub_classes = [
         Scenario,