diff --git a/pom.xml b/pom.xml
index 169fc5aeb..ef6c97d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>calendar-web</artifactId>
-      <version>5.5</version>
+      <version>5.6-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
@@ -162,6 +162,11 @@
     </dependency>
 
     <!-- celements dependencies -->
+    <dependency>
+      <groupId>com.celements</groupId>
+      <artifactId>celements-performance</artifactId>
+      <version>5.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-commons</artifactId>
@@ -205,7 +210,7 @@
     <dependency>
       <groupId>com.celements</groupId>
       <artifactId>celements-search</artifactId>
-      <version>5.3</version>
+      <version>5.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.celements</groupId>
diff --git a/src/main/webapp/templates/celMacros/benchmark.vm b/src/main/webapp/templates/celMacros/benchmark.vm
deleted file mode 100644
index 5d077b7bc..000000000
--- a/src/main/webapp/templates/celMacros/benchmark.vm
+++ /dev/null
@@ -1,20 +0,0 @@
-## usage: parsing the template will start the benchmark and set the start time
-##        using the macro #bench will print the time since last call and total time since start
-##        only works for super admins
-## INPUT label to distinguish time printouts
-
-#set($bench_startTime = $datetool.date.time)
-#set($bench_lastTime = $bench_startTime)
-
-#macro(bench $label $visible)
-#if($isSuperAdmin)
-  #set($visible = $visible || ("$!request.showBenchmark" == 'true'))
-  #set($currTime = $datetool.date.time)
-  #set($totalTime = ($currTime - $bench_startTime) / 1000.0)
-  #set($time = ($currTime - $bench_lastTime) / 1000.0)
-  #if(!$visible) <!-- #end
-  bench $!label &mdash; in ${time}s &mdash; total ${totalTime}s
-  #if(!$visible) --> #end
-  #set($bench_lastTime = $currTime)
-#end
-#end
diff --git a/src/main/webapp/templates/celMacros/debug/queryexec.vm b/src/main/webapp/templates/celMacros/debug/queryexec.vm
index 5c5725b6e..91c28f502 100644
--- a/src/main/webapp/templates/celMacros/debug/queryexec.vm
+++ b/src/main/webapp/templates/celMacros/debug/queryexec.vm
@@ -41,9 +41,9 @@
   
   <p><b>${query.language}-query</b> &mdash; <i>$query.statement</i></p>
   <p>limit: $limit &mdash; printLimit: $printLimit </p>
-  #parse('celMacros/benchmark.vm') ## start benchmark
+  $services.bench.startBench()
   #set($result = $query.execute())
-  <p>#bench('query execution time' true)</p>
+  <p>$services.bench.benchAndPrint('query execution time', true)</p>
   <p>result count: $result.size() #if($limit > 0 && $result.size() >= $limit) (limited) #end</p>
   <hr>
   #if(!$noResultList)
@@ -65,7 +65,7 @@
       </div>
     #end
     <hr>
-    <p>#bench('printing result list' true)</p>
+    <p>$services.bench.benchAndPrint('printing result list', true)</p>
   #end ## noResultList
 
 #end ## ("$!query" == '')