diff --git a/scripts/ci/e2e_benchmark.py b/scripts/ci/e2e_benchmark.py
index abe37e03c..7c6b69cf8 100644
--- a/scripts/ci/e2e_benchmark.py
+++ b/scripts/ci/e2e_benchmark.py
@@ -7,45 +7,83 @@ import csv
 import numpy as np
 import time
 
+class BenchmarkRunner:
+    def __init__(self):
+        self.coordinates = []
+        self.tracks = defaultdict(list)
+
+        gps_traces_file_path = os.path.expanduser('~/gps_traces.csv')
+        with open(gps_traces_file_path, 'r') as file:
+            reader = csv.DictReader(file)
+            for row in reader:
+                coord = (float(row['Latitude']), float(row['Longitude']))
+                self.coordinates.append(coord)
+                self.tracks[row['TrackID']].append(coord)
+        self.track_ids = list(self.tracks.keys())
+    
+    def run(self, benchmark_name, host, num_requests):
+        times = []
+
+        for _ in range(num_requests):
+            url = self.make_url(host, benchmark_name)
+
+            start_time = time.time()
+            response = requests.get(url)
+            end_time = time.time()
+            if response.status_code != 200:
+                raise Exception(f"Error: {response.status_code} {response.text}")
+            times.append(end_time - start_time)
+        
+        return times
+    
+    def make_url(self, host, benchmark_name): 
+        if benchmark_name == 'route':
+            start = random.choice(self.coordinates)
+            end = random.choice(self.coordinates)
+            
+            start_coord = f"{start[1]:.6f},{start[0]:.6f}"
+            end_coord = f"{end[1]:.6f},{end[0]:.6f}"
+            return f"{host}/route/v1/driving/{start_coord};{end_coord}?overview=full&steps=true"
+        elif benchmark_name == 'table':
+            num_coords = random.randint(3, 100)
+            selected_coords = random.sample(self.coordinates, num_coords)
+            coords_str = ";".join([f"{coord[1]:.6f},{coord[0]:.6f}" for coord in selected_coords])
+            return f"{host}/table/v1/driving/{coords_str}"
+        elif benchmark_name == 'match':
+            num_coords = random.randint(50, 100)
+            track_id = random.choice(self.track_ids)
+            track_coords = self.tracks[track_id][:num_coords]
+            coords_str = ";".join([f"{coord[1]:.6f},{coord[0]:.6f}" for coord in track_coords])
+            radiues_str = ";".join([f"{random.randint(5, 20)}" for _ in range(len(track_coords))])
+            return f"{host}/match/v1/driving/{coords_str}?steps=true&radiuses={radiues_str}"
+        elif benchmark_name == 'nearest':
+            coord = random.choice(self.coordinates)
+            coord_str = f"{coord[1]:.6f},{coord[0]:.6f}"
+            return f"{host}/nearest/v1/driving/{coord_str}"
+        elif benchmark_name == 'trip':
+            num_coords = random.randint(2, 10)
+            selected_coords = random.sample(self.coordinates, num_coords)
+            coords_str = ";".join([f"{coord[1]:.6f},{coord[0]:.6f}" for coord in selected_coords])
+            return f"{host}/trip/v1/driving/{coords_str}?steps=true"
+        else:
+            raise Exception(f"Unknown benchmark: {benchmark_name}")
+
 def main():
     pass
 
     random.seed(42)
 
-    coordinates = []
-    tracks = defaultdict(list)
+    runner = BenchmarkRunner()
+    host = "http://localhost:5000"
+    times = runner.run('route', host, 10000)
 
-    gps_traces_file_path = os.path.expanduser('~/gps_traces.csv')
-    with open(gps_traces_file_path, 'r') as file:
-        reader = csv.DictReader(file)
-        for row in reader:
-            coord = (float(row['Latitude']), float(row['Longitude']))
-            coordinates.append(coord)
-            tracks[row['TrackID']].append(coord)
-    track_ids = list(tracks.keys())
-
-    url = "http://localhost:5000"
-
-    times = []
-
-    for _ in range(10000):
-        start = random.choice(coordinates)
-        end = random.choice(coordinates)
-        
-        start_coord = f"{start[1]:.6f},{start[0]:.6f}"
-        end_coord = f"{end[1]:.6f},{end[0]:.6f}"
-
-        start_time = time.time()
-        response = requests.get(f"{url}/route/v1/driving/{start_coord};{end_coord}?overview=full&steps=true")
-        end_time = time.time()
-        if response.status_code != 200:
-            raise Exception(f"Error: {response.status_code} {response.text}")
-        times.append(end_time - start_time)
-    
+    print(f'Total: {np.sum(times)}')
+    print(f"Min time: {np.min(times)}")
     print(f"Mean time: {np.mean(times)}")
-    
-
-
+    print(f"Median time: {np.median(times)}")
+    print(f"95th percentile: {np.percentile(times, 95)}")
+    print(f"99th percentile: {np.percentile(times, 99)}")
+    print(f"Max time: {np.max(times)}")
 
 if __name__ == '__main__':
     main()
\ No newline at end of file