diff --git a/coverage/coverage.out b/coverage/coverage.out
index 231f92f..6a79144 100644
--- a/coverage/coverage.out
+++ b/coverage/coverage.out
@@ -4,7 +4,196 @@ github.com/muety/wakapi/models/alias.go:22.37,23.35 1 0
 github.com/muety/wakapi/models/alias.go:28.2,28.14 1 0
 github.com/muety/wakapi/models/alias.go:23.35,24.18 1 0
 github.com/muety/wakapi/models/alias.go:24.18,26.4 1 0
+github.com/muety/wakapi/models/filters.go:21.33,23.2 1 1
+github.com/muety/wakapi/models/filters.go:25.48,26.22 1 1
+github.com/muety/wakapi/models/filters.go:31.2,31.14 1 1
+github.com/muety/wakapi/models/filters.go:26.22,27.18 1 1
+github.com/muety/wakapi/models/filters.go:27.18,29.4 1 1
+github.com/muety/wakapi/models/filters.go:39.56,41.2 1 1
+github.com/muety/wakapi/models/filters.go:43.66,46.2 2 1
+github.com/muety/wakapi/models/filters.go:48.59,50.2 1 1
+github.com/muety/wakapi/models/filters.go:52.70,53.16 1 1
+github.com/muety/wakapi/models/filters.go:69.2,69.10 1 1
+github.com/muety/wakapi/models/filters.go:54.22,55.41 1 1
+github.com/muety/wakapi/models/filters.go:56.17,57.31 1 0
+github.com/muety/wakapi/models/filters.go:58.23,59.43 1 1
+github.com/muety/wakapi/models/filters.go:60.21,61.39 1 0
+github.com/muety/wakapi/models/filters.go:62.22,63.41 1 0
+github.com/muety/wakapi/models/filters.go:64.20,65.37 1 1
+github.com/muety/wakapi/models/filters.go:66.21,67.39 1 0
+github.com/muety/wakapi/models/filters.go:72.49,73.44 1 1
+github.com/muety/wakapi/models/filters.go:88.2,88.29 1 1
+github.com/muety/wakapi/models/filters.go:73.44,75.3 1 1
+github.com/muety/wakapi/models/filters.go:75.8,75.41 1 1
+github.com/muety/wakapi/models/filters.go:75.41,77.3 1 0
+github.com/muety/wakapi/models/filters.go:77.8,77.53 1 1
+github.com/muety/wakapi/models/filters.go:77.53,79.3 1 1
+github.com/muety/wakapi/models/filters.go:79.8,79.49 1 1
+github.com/muety/wakapi/models/filters.go:79.49,81.3 1 0
+github.com/muety/wakapi/models/filters.go:81.8,81.51 1 1
+github.com/muety/wakapi/models/filters.go:81.51,83.3 1 0
+github.com/muety/wakapi/models/filters.go:83.8,83.47 1 1
+github.com/muety/wakapi/models/filters.go:83.47,85.3 1 0
+github.com/muety/wakapi/models/filters.go:85.8,85.49 1 1
+github.com/muety/wakapi/models/filters.go:85.49,87.3 1 0
+github.com/muety/wakapi/models/filters.go:91.46,92.30 1 1
+github.com/muety/wakapi/models/filters.go:95.2,95.66 1 0
+github.com/muety/wakapi/models/filters.go:92.30,94.3 1 1
+github.com/muety/wakapi/models/filters.go:98.34,101.2 2 1
+github.com/muety/wakapi/models/filters.go:103.31,105.51 2 0
+github.com/muety/wakapi/models/filters.go:108.2,108.14 1 0
+github.com/muety/wakapi/models/filters.go:105.51,107.3 1 0
+github.com/muety/wakapi/models/filters.go:111.51,113.2 1 0
+github.com/muety/wakapi/models/filters.go:115.37,117.51 2 0
+github.com/muety/wakapi/models/filters.go:122.2,122.14 1 0
+github.com/muety/wakapi/models/filters.go:117.51,118.37 1 0
+github.com/muety/wakapi/models/filters.go:118.37,120.4 1 0
+github.com/muety/wakapi/models/filters.go:125.59,126.18 1 0
+github.com/muety/wakapi/models/filters.go:127.22,128.20 1 0
+github.com/muety/wakapi/models/filters.go:129.23,130.21 1 0
+github.com/muety/wakapi/models/filters.go:131.21,132.19 1 0
+github.com/muety/wakapi/models/filters.go:133.17,134.15 1 0
+github.com/muety/wakapi/models/filters.go:135.22,136.20 1 0
+github.com/muety/wakapi/models/filters.go:137.20,138.18 1 0
+github.com/muety/wakapi/models/filters.go:139.21,140.19 1 0
+github.com/muety/wakapi/models/filters.go:141.10,142.21 1 0
+github.com/muety/wakapi/models/filters.go:146.33,148.16 2 0
+github.com/muety/wakapi/models/filters.go:151.2,151.32 1 0
+github.com/muety/wakapi/models/filters.go:148.16,150.3 1 0
+github.com/muety/wakapi/models/filters.go:154.44,160.2 1 1
+github.com/muety/wakapi/models/filters.go:163.70,164.22 1 1
+github.com/muety/wakapi/models/filters.go:172.2,172.17 1 1
+github.com/muety/wakapi/models/filters.go:180.2,180.23 1 1
+github.com/muety/wakapi/models/filters.go:188.2,188.21 1 1
+github.com/muety/wakapi/models/filters.go:196.2,196.22 1 1
+github.com/muety/wakapi/models/filters.go:204.2,204.21 1 1
+github.com/muety/wakapi/models/filters.go:212.2,212.10 1 1
+github.com/muety/wakapi/models/filters.go:164.22,166.31 2 1
+github.com/muety/wakapi/models/filters.go:170.3,170.22 1 1
+github.com/muety/wakapi/models/filters.go:166.31,169.4 2 1
+github.com/muety/wakapi/models/filters.go:172.17,174.26 2 0
+github.com/muety/wakapi/models/filters.go:178.3,178.17 1 0
+github.com/muety/wakapi/models/filters.go:174.26,177.4 2 0
+github.com/muety/wakapi/models/filters.go:180.23,182.32 2 1
+github.com/muety/wakapi/models/filters.go:186.3,186.23 1 1
+github.com/muety/wakapi/models/filters.go:182.32,185.4 2 1
+github.com/muety/wakapi/models/filters.go:188.21,190.30 2 0
+github.com/muety/wakapi/models/filters.go:194.3,194.21 1 0
+github.com/muety/wakapi/models/filters.go:190.30,193.4 2 0
+github.com/muety/wakapi/models/filters.go:196.22,198.31 2 0
+github.com/muety/wakapi/models/filters.go:202.3,202.22 1 0
+github.com/muety/wakapi/models/filters.go:198.31,201.4 2 0
+github.com/muety/wakapi/models/filters.go:204.21,206.30 2 0
+github.com/muety/wakapi/models/filters.go:210.3,210.21 1 0
+github.com/muety/wakapi/models/filters.go:206.30,209.4 2 0
+github.com/muety/wakapi/models/filters.go:215.83,216.41 1 1
+github.com/muety/wakapi/models/filters.go:219.2,219.28 1 1
+github.com/muety/wakapi/models/filters.go:222.2,222.10 1 1
+github.com/muety/wakapi/models/filters.go:216.41,218.3 1 0
+github.com/muety/wakapi/models/filters.go:219.28,221.3 1 1
+github.com/muety/wakapi/models/interval.go:39.47,40.23 1 0
+github.com/muety/wakapi/models/interval.go:45.2,45.14 1 0
+github.com/muety/wakapi/models/interval.go:40.23,41.13 1 0
+github.com/muety/wakapi/models/interval.go:41.13,43.4 1 0
+github.com/muety/wakapi/models/mail_address.go:15.13,18.2 2 1
+github.com/muety/wakapi/models/mail_address.go:24.38,26.2 1 0
+github.com/muety/wakapi/models/mail_address.go:28.35,30.21 2 1
+github.com/muety/wakapi/models/mail_address.go:36.2,36.11 1 1
+github.com/muety/wakapi/models/mail_address.go:30.21,31.21 1 1
+github.com/muety/wakapi/models/mail_address.go:34.3,34.18 1 1
+github.com/muety/wakapi/models/mail_address.go:31.21,33.4 1 1
+github.com/muety/wakapi/models/mail_address.go:39.35,41.2 1 1
+github.com/muety/wakapi/models/mail_address.go:43.43,45.22 2 0
+github.com/muety/wakapi/models/mail_address.go:48.2,48.12 1 0
+github.com/muety/wakapi/models/mail_address.go:45.22,47.3 1 0
+github.com/muety/wakapi/models/mail_address.go:51.46,53.22 2 1
+github.com/muety/wakapi/models/mail_address.go:56.2,56.12 1 1
+github.com/muety/wakapi/models/mail_address.go:53.22,55.3 1 1
+github.com/muety/wakapi/models/mail_address.go:59.40,60.22 1 1
+github.com/muety/wakapi/models/mail_address.go:65.2,65.13 1 1
+github.com/muety/wakapi/models/mail_address.go:60.22,61.17 1 1
+github.com/muety/wakapi/models/mail_address.go:61.17,63.4 1 1
+github.com/muety/wakapi/models/shared.go:35.52,37.2 1 0
+github.com/muety/wakapi/models/shared.go:39.52,42.16 3 0
+github.com/muety/wakapi/models/shared.go:45.2,47.12 3 0
+github.com/muety/wakapi/models/shared.go:42.16,44.3 1 0
+github.com/muety/wakapi/models/shared.go:50.52,56.22 2 0
+github.com/muety/wakapi/models/shared.go:71.2,74.12 3 0
+github.com/muety/wakapi/models/shared.go:57.14,61.17 2 0
+github.com/muety/wakapi/models/shared.go:64.17,66.8 2 0
+github.com/muety/wakapi/models/shared.go:67.10,68.64 1 0
+github.com/muety/wakapi/models/shared.go:61.17,63.4 1 0
+github.com/muety/wakapi/models/shared.go:77.51,80.2 2 0
+github.com/muety/wakapi/models/shared.go:82.45,84.2 1 0
+github.com/muety/wakapi/models/shared.go:86.37,88.2 1 0
+github.com/muety/wakapi/models/shared.go:90.35,92.2 1 0
+github.com/muety/wakapi/models/shared.go:94.34,96.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:33.34,35.2 1 1
+github.com/muety/wakapi/models/heartbeat.go:37.55,40.2 2 0
+github.com/muety/wakapi/models/heartbeat.go:42.65,44.46 2 1
+github.com/muety/wakapi/models/heartbeat.go:44.46,45.108 1 1
+github.com/muety/wakapi/models/heartbeat.go:45.108,48.4 2 1
+github.com/muety/wakapi/models/heartbeat.go:52.50,53.11 1 1
+github.com/muety/wakapi/models/heartbeat.go:68.2,68.15 1 1
+github.com/muety/wakapi/models/heartbeat.go:72.2,72.12 1 1
+github.com/muety/wakapi/models/heartbeat.go:54.22,55.18 1 1
+github.com/muety/wakapi/models/heartbeat.go:56.21,57.17 1 1
+github.com/muety/wakapi/models/heartbeat.go:58.23,59.19 1 1
+github.com/muety/wakapi/models/heartbeat.go:60.17,61.26 1 1
+github.com/muety/wakapi/models/heartbeat.go:62.22,63.18 1 1
+github.com/muety/wakapi/models/heartbeat.go:64.21,65.17 1 0
+github.com/muety/wakapi/models/heartbeat.go:68.15,70.3 1 1
+github.com/muety/wakapi/models/heartbeat.go:75.37,91.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:99.41,101.16 2 0
+github.com/muety/wakapi/models/heartbeat.go:104.2,105.10 2 0
+github.com/muety/wakapi/models/heartbeat.go:101.16,103.3 1 0
+github.com/muety/wakapi/models/heartbeat.go:108.38,118.2 1 0
+github.com/muety/wakapi/models/language_mapping.go:11.42,13.2 1 0
+github.com/muety/wakapi/models/language_mapping.go:15.51,17.2 1 0
+github.com/muety/wakapi/models/language_mapping.go:19.52,21.2 1 0
+github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
 github.com/muety/wakapi/models/project_label.go:14.39,16.2 1 0
+github.com/muety/wakapi/models/duration.go:24.55,38.2 2 0
+github.com/muety/wakapi/models/duration.go:40.39,42.16 2 0
+github.com/muety/wakapi/models/duration.go:45.2,46.10 2 0
+github.com/muety/wakapi/models/duration.go:42.16,44.3 1 0
+github.com/muety/wakapi/models/duration.go:49.49,50.11 1 0
+github.com/muety/wakapi/models/duration.go:65.2,65.15 1 0
+github.com/muety/wakapi/models/duration.go:69.2,69.12 1 0
+github.com/muety/wakapi/models/duration.go:51.22,52.18 1 0
+github.com/muety/wakapi/models/duration.go:53.21,54.17 1 0
+github.com/muety/wakapi/models/duration.go:55.23,56.19 1 0
+github.com/muety/wakapi/models/duration.go:57.17,58.26 1 0
+github.com/muety/wakapi/models/duration.go:59.22,60.18 1 0
+github.com/muety/wakapi/models/duration.go:61.21,62.17 1 0
+github.com/muety/wakapi/models/duration.go:65.15,67.3 1 0
+github.com/muety/wakapi/models/durations.go:7.30,9.2 1 0
+github.com/muety/wakapi/models/durations.go:11.40,13.2 1 0
+github.com/muety/wakapi/models/durations.go:15.35,17.2 1 0
+github.com/muety/wakapi/models/durations.go:19.45,21.22 2 0
+github.com/muety/wakapi/models/durations.go:24.2,24.14 1 0
+github.com/muety/wakapi/models/durations.go:21.22,23.3 1 0
+github.com/muety/wakapi/models/durations.go:27.39,30.2 2 0
+github.com/muety/wakapi/models/durations.go:32.39,34.18 1 0
+github.com/muety/wakapi/models/durations.go:37.2,37.16 1 0
+github.com/muety/wakapi/models/durations.go:34.18,36.3 1 0
+github.com/muety/wakapi/models/durations.go:40.38,42.18 1 0
+github.com/muety/wakapi/models/durations.go:45.2,45.24 1 0
+github.com/muety/wakapi/models/durations.go:42.18,44.3 1 0
+github.com/muety/wakapi/models/heartbeats.go:7.31,9.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:11.41,13.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:15.36,17.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0
+github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0
+github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0
+github.com/muety/wakapi/models/heartbeats.go:26.18,28.3 1 0
+github.com/muety/wakapi/models/heartbeats.go:32.40,34.18 1 0
+github.com/muety/wakapi/models/heartbeats.go:37.2,37.24 1 0
+github.com/muety/wakapi/models/heartbeats.go:34.18,36.3 1 0
+github.com/muety/wakapi/models/mail.go:19.44,23.2 3 0
+github.com/muety/wakapi/models/mail.go:25.44,29.2 3 0
+github.com/muety/wakapi/models/mail.go:31.32,44.2 1 0
+github.com/muety/wakapi/models/mail.go:46.41,48.2 1 0
 github.com/muety/wakapi/models/summary.go:64.29,66.2 1 1
 github.com/muety/wakapi/models/summary.go:68.35,70.2 1 0
 github.com/muety/wakapi/models/summary.go:72.38,74.2 1 0
@@ -126,195 +315,44 @@ github.com/muety/wakapi/models/user.go:142.45,144.2 1 0
 github.com/muety/wakapi/models/user.go:146.45,148.2 1 0
 github.com/muety/wakapi/models/user.go:150.39,152.2 1 0
 github.com/muety/wakapi/models/user.go:154.39,157.2 2 0
-github.com/muety/wakapi/models/filters.go:21.33,23.2 1 1
-github.com/muety/wakapi/models/filters.go:25.48,26.22 1 1
-github.com/muety/wakapi/models/filters.go:31.2,31.14 1 1
-github.com/muety/wakapi/models/filters.go:26.22,27.18 1 1
-github.com/muety/wakapi/models/filters.go:27.18,29.4 1 1
-github.com/muety/wakapi/models/filters.go:39.56,41.2 1 1
-github.com/muety/wakapi/models/filters.go:43.66,46.2 2 1
-github.com/muety/wakapi/models/filters.go:48.59,50.2 1 1
-github.com/muety/wakapi/models/filters.go:52.70,53.16 1 1
-github.com/muety/wakapi/models/filters.go:69.2,69.10 1 1
-github.com/muety/wakapi/models/filters.go:54.22,55.41 1 1
-github.com/muety/wakapi/models/filters.go:56.17,57.31 1 0
-github.com/muety/wakapi/models/filters.go:58.23,59.43 1 1
-github.com/muety/wakapi/models/filters.go:60.21,61.39 1 0
-github.com/muety/wakapi/models/filters.go:62.22,63.41 1 0
-github.com/muety/wakapi/models/filters.go:64.20,65.37 1 1
-github.com/muety/wakapi/models/filters.go:66.21,67.39 1 0
-github.com/muety/wakapi/models/filters.go:72.49,73.44 1 1
-github.com/muety/wakapi/models/filters.go:88.2,88.29 1 1
-github.com/muety/wakapi/models/filters.go:73.44,75.3 1 1
-github.com/muety/wakapi/models/filters.go:75.8,75.41 1 1
-github.com/muety/wakapi/models/filters.go:75.41,77.3 1 0
-github.com/muety/wakapi/models/filters.go:77.8,77.53 1 1
-github.com/muety/wakapi/models/filters.go:77.53,79.3 1 1
-github.com/muety/wakapi/models/filters.go:79.8,79.49 1 1
-github.com/muety/wakapi/models/filters.go:79.49,81.3 1 0
-github.com/muety/wakapi/models/filters.go:81.8,81.51 1 1
-github.com/muety/wakapi/models/filters.go:81.51,83.3 1 0
-github.com/muety/wakapi/models/filters.go:83.8,83.47 1 1
-github.com/muety/wakapi/models/filters.go:83.47,85.3 1 0
-github.com/muety/wakapi/models/filters.go:85.8,85.49 1 1
-github.com/muety/wakapi/models/filters.go:85.49,87.3 1 0
-github.com/muety/wakapi/models/filters.go:91.46,92.30 1 1
-github.com/muety/wakapi/models/filters.go:95.2,95.66 1 0
-github.com/muety/wakapi/models/filters.go:92.30,94.3 1 1
-github.com/muety/wakapi/models/filters.go:98.34,101.2 2 1
-github.com/muety/wakapi/models/filters.go:103.31,105.51 2 0
-github.com/muety/wakapi/models/filters.go:108.2,108.14 1 0
-github.com/muety/wakapi/models/filters.go:105.51,107.3 1 0
-github.com/muety/wakapi/models/filters.go:111.51,113.2 1 0
-github.com/muety/wakapi/models/filters.go:115.37,117.51 2 0
-github.com/muety/wakapi/models/filters.go:122.2,122.14 1 0
-github.com/muety/wakapi/models/filters.go:117.51,118.37 1 0
-github.com/muety/wakapi/models/filters.go:118.37,120.4 1 0
-github.com/muety/wakapi/models/filters.go:125.59,126.18 1 0
-github.com/muety/wakapi/models/filters.go:127.22,128.20 1 0
-github.com/muety/wakapi/models/filters.go:129.23,130.21 1 0
-github.com/muety/wakapi/models/filters.go:131.21,132.19 1 0
-github.com/muety/wakapi/models/filters.go:133.17,134.15 1 0
-github.com/muety/wakapi/models/filters.go:135.22,136.20 1 0
-github.com/muety/wakapi/models/filters.go:137.20,138.18 1 0
-github.com/muety/wakapi/models/filters.go:139.21,140.19 1 0
-github.com/muety/wakapi/models/filters.go:141.10,142.21 1 0
-github.com/muety/wakapi/models/filters.go:146.33,148.16 2 0
-github.com/muety/wakapi/models/filters.go:151.2,151.32 1 0
-github.com/muety/wakapi/models/filters.go:148.16,150.3 1 0
-github.com/muety/wakapi/models/filters.go:154.44,160.2 1 1
-github.com/muety/wakapi/models/filters.go:163.70,164.22 1 1
-github.com/muety/wakapi/models/filters.go:172.2,172.17 1 1
-github.com/muety/wakapi/models/filters.go:180.2,180.23 1 1
-github.com/muety/wakapi/models/filters.go:188.2,188.21 1 1
-github.com/muety/wakapi/models/filters.go:196.2,196.22 1 1
-github.com/muety/wakapi/models/filters.go:204.2,204.21 1 1
-github.com/muety/wakapi/models/filters.go:212.2,212.10 1 1
-github.com/muety/wakapi/models/filters.go:164.22,166.31 2 1
-github.com/muety/wakapi/models/filters.go:170.3,170.22 1 1
-github.com/muety/wakapi/models/filters.go:166.31,169.4 2 1
-github.com/muety/wakapi/models/filters.go:172.17,174.26 2 0
-github.com/muety/wakapi/models/filters.go:178.3,178.17 1 0
-github.com/muety/wakapi/models/filters.go:174.26,177.4 2 0
-github.com/muety/wakapi/models/filters.go:180.23,182.32 2 1
-github.com/muety/wakapi/models/filters.go:186.3,186.23 1 1
-github.com/muety/wakapi/models/filters.go:182.32,185.4 2 1
-github.com/muety/wakapi/models/filters.go:188.21,190.30 2 0
-github.com/muety/wakapi/models/filters.go:194.3,194.21 1 0
-github.com/muety/wakapi/models/filters.go:190.30,193.4 2 0
-github.com/muety/wakapi/models/filters.go:196.22,198.31 2 0
-github.com/muety/wakapi/models/filters.go:202.3,202.22 1 0
-github.com/muety/wakapi/models/filters.go:198.31,201.4 2 0
-github.com/muety/wakapi/models/filters.go:204.21,206.30 2 0
-github.com/muety/wakapi/models/filters.go:210.3,210.21 1 0
-github.com/muety/wakapi/models/filters.go:206.30,209.4 2 0
-github.com/muety/wakapi/models/filters.go:215.83,216.41 1 1
-github.com/muety/wakapi/models/filters.go:219.2,219.28 1 1
-github.com/muety/wakapi/models/filters.go:222.2,222.10 1 1
-github.com/muety/wakapi/models/filters.go:216.41,218.3 1 0
-github.com/muety/wakapi/models/filters.go:219.28,221.3 1 1
-github.com/muety/wakapi/models/heartbeat.go:33.34,35.2 1 1
-github.com/muety/wakapi/models/heartbeat.go:37.55,40.2 2 0
-github.com/muety/wakapi/models/heartbeat.go:42.65,44.46 2 1
-github.com/muety/wakapi/models/heartbeat.go:44.46,45.108 1 1
-github.com/muety/wakapi/models/heartbeat.go:45.108,48.4 2 1
-github.com/muety/wakapi/models/heartbeat.go:52.50,53.11 1 1
-github.com/muety/wakapi/models/heartbeat.go:68.2,68.15 1 1
-github.com/muety/wakapi/models/heartbeat.go:72.2,72.12 1 1
-github.com/muety/wakapi/models/heartbeat.go:54.22,55.18 1 1
-github.com/muety/wakapi/models/heartbeat.go:56.21,57.17 1 1
-github.com/muety/wakapi/models/heartbeat.go:58.23,59.19 1 1
-github.com/muety/wakapi/models/heartbeat.go:60.17,61.26 1 1
-github.com/muety/wakapi/models/heartbeat.go:62.22,63.18 1 1
-github.com/muety/wakapi/models/heartbeat.go:64.21,65.17 1 0
-github.com/muety/wakapi/models/heartbeat.go:68.15,70.3 1 1
-github.com/muety/wakapi/models/heartbeat.go:75.37,91.2 1 0
-github.com/muety/wakapi/models/heartbeat.go:99.41,101.16 2 0
-github.com/muety/wakapi/models/heartbeat.go:104.2,105.10 2 0
-github.com/muety/wakapi/models/heartbeat.go:101.16,103.3 1 0
-github.com/muety/wakapi/models/heartbeat.go:108.38,118.2 1 0
-github.com/muety/wakapi/models/mail_address.go:15.13,18.2 2 1
-github.com/muety/wakapi/models/mail_address.go:24.38,26.2 1 0
-github.com/muety/wakapi/models/mail_address.go:28.35,30.21 2 1
-github.com/muety/wakapi/models/mail_address.go:36.2,36.11 1 1
-github.com/muety/wakapi/models/mail_address.go:30.21,31.21 1 1
-github.com/muety/wakapi/models/mail_address.go:34.3,34.18 1 1
-github.com/muety/wakapi/models/mail_address.go:31.21,33.4 1 1
-github.com/muety/wakapi/models/mail_address.go:39.35,41.2 1 1
-github.com/muety/wakapi/models/mail_address.go:43.43,45.22 2 0
-github.com/muety/wakapi/models/mail_address.go:48.2,48.12 1 0
-github.com/muety/wakapi/models/mail_address.go:45.22,47.3 1 0
-github.com/muety/wakapi/models/mail_address.go:51.46,53.22 2 1
-github.com/muety/wakapi/models/mail_address.go:56.2,56.12 1 1
-github.com/muety/wakapi/models/mail_address.go:53.22,55.3 1 1
-github.com/muety/wakapi/models/mail_address.go:59.40,60.22 1 1
-github.com/muety/wakapi/models/mail_address.go:65.2,65.13 1 1
-github.com/muety/wakapi/models/mail_address.go:60.22,61.17 1 1
-github.com/muety/wakapi/models/mail_address.go:61.17,63.4 1 1
-github.com/muety/wakapi/models/shared.go:35.52,37.2 1 0
-github.com/muety/wakapi/models/shared.go:39.52,42.16 3 0
-github.com/muety/wakapi/models/shared.go:45.2,47.12 3 0
-github.com/muety/wakapi/models/shared.go:42.16,44.3 1 0
-github.com/muety/wakapi/models/shared.go:50.52,56.22 2 0
-github.com/muety/wakapi/models/shared.go:71.2,74.12 3 0
-github.com/muety/wakapi/models/shared.go:57.14,61.17 2 0
-github.com/muety/wakapi/models/shared.go:64.17,66.8 2 0
-github.com/muety/wakapi/models/shared.go:67.10,68.64 1 0
-github.com/muety/wakapi/models/shared.go:61.17,63.4 1 0
-github.com/muety/wakapi/models/shared.go:77.51,80.2 2 0
-github.com/muety/wakapi/models/shared.go:82.45,84.2 1 0
-github.com/muety/wakapi/models/shared.go:86.37,88.2 1 0
-github.com/muety/wakapi/models/shared.go:90.35,92.2 1 0
-github.com/muety/wakapi/models/shared.go:94.34,96.2 1 0
-github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
-github.com/muety/wakapi/models/durations.go:7.30,9.2 1 0
-github.com/muety/wakapi/models/durations.go:11.40,13.2 1 0
-github.com/muety/wakapi/models/durations.go:15.35,17.2 1 0
-github.com/muety/wakapi/models/durations.go:19.45,21.22 2 0
-github.com/muety/wakapi/models/durations.go:24.2,24.14 1 0
-github.com/muety/wakapi/models/durations.go:21.22,23.3 1 0
-github.com/muety/wakapi/models/durations.go:27.39,30.2 2 0
-github.com/muety/wakapi/models/durations.go:32.39,34.18 1 0
-github.com/muety/wakapi/models/durations.go:37.2,37.16 1 0
-github.com/muety/wakapi/models/durations.go:34.18,36.3 1 0
-github.com/muety/wakapi/models/durations.go:40.38,42.18 1 0
-github.com/muety/wakapi/models/durations.go:45.2,45.24 1 0
-github.com/muety/wakapi/models/durations.go:42.18,44.3 1 0
-github.com/muety/wakapi/models/heartbeats.go:7.31,9.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:11.41,13.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:15.36,17.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0
-github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0
-github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0
-github.com/muety/wakapi/models/heartbeats.go:26.18,28.3 1 0
-github.com/muety/wakapi/models/heartbeats.go:32.40,34.18 1 0
-github.com/muety/wakapi/models/heartbeats.go:37.2,37.24 1 0
-github.com/muety/wakapi/models/heartbeats.go:34.18,36.3 1 0
-github.com/muety/wakapi/models/interval.go:39.47,40.23 1 0
-github.com/muety/wakapi/models/interval.go:45.2,45.14 1 0
-github.com/muety/wakapi/models/interval.go:40.23,41.13 1 0
-github.com/muety/wakapi/models/interval.go:41.13,43.4 1 0
-github.com/muety/wakapi/models/mail.go:19.44,23.2 3 0
-github.com/muety/wakapi/models/mail.go:25.44,29.2 3 0
-github.com/muety/wakapi/models/mail.go:31.32,44.2 1 0
-github.com/muety/wakapi/models/mail.go:46.41,48.2 1 0
-github.com/muety/wakapi/models/duration.go:24.55,38.2 2 0
-github.com/muety/wakapi/models/duration.go:40.39,42.16 2 0
-github.com/muety/wakapi/models/duration.go:45.2,46.10 2 0
-github.com/muety/wakapi/models/duration.go:42.16,44.3 1 0
-github.com/muety/wakapi/models/duration.go:49.49,50.11 1 0
-github.com/muety/wakapi/models/duration.go:65.2,65.15 1 0
-github.com/muety/wakapi/models/duration.go:69.2,69.12 1 0
-github.com/muety/wakapi/models/duration.go:51.22,52.18 1 0
-github.com/muety/wakapi/models/duration.go:53.21,54.17 1 0
-github.com/muety/wakapi/models/duration.go:55.23,56.19 1 0
-github.com/muety/wakapi/models/duration.go:57.17,58.26 1 0
-github.com/muety/wakapi/models/duration.go:59.22,60.18 1 0
-github.com/muety/wakapi/models/duration.go:61.21,62.17 1 0
-github.com/muety/wakapi/models/duration.go:65.15,67.3 1 0
-github.com/muety/wakapi/models/language_mapping.go:11.42,13.2 1 0
-github.com/muety/wakapi/models/language_mapping.go:15.51,17.2 1 0
-github.com/muety/wakapi/models/language_mapping.go:19.52,21.2 1 0
+github.com/muety/wakapi/config/sentry.go:22.35,24.2 1 0
+github.com/muety/wakapi/config/sentry.go:26.62,29.2 2 0
+github.com/muety/wakapi/config/sentry.go:39.33,46.2 2 0
+github.com/muety/wakapi/config/sentry.go:48.79,51.2 2 0
+github.com/muety/wakapi/config/sentry.go:53.72,57.2 3 0
+github.com/muety/wakapi/config/sentry.go:59.71,63.2 3 0
+github.com/muety/wakapi/config/sentry.go:65.71,69.2 3 0
+github.com/muety/wakapi/config/sentry.go:71.72,75.2 3 0
+github.com/muety/wakapi/config/sentry.go:77.72,81.2 3 0
+github.com/muety/wakapi/config/sentry.go:83.67,88.18 4 0
+github.com/muety/wakapi/config/sentry.go:100.2,100.28 1 0
+github.com/muety/wakapi/config/sentry.go:88.18,89.65 1 0
+github.com/muety/wakapi/config/sentry.go:89.65,92.42 3 0
+github.com/muety/wakapi/config/sentry.go:95.4,96.10 2 0
+github.com/muety/wakapi/config/sentry.go:92.42,94.5 1 0
+github.com/muety/wakapi/config/sentry.go:110.50,114.91 1 0
+github.com/muety/wakapi/config/sentry.go:114.91,115.29 1 0
+github.com/muety/wakapi/config/sentry.go:119.4,122.38 3 0
+github.com/muety/wakapi/config/sentry.go:127.4,127.39 1 0
+github.com/muety/wakapi/config/sentry.go:130.4,130.69 1 0
+github.com/muety/wakapi/config/sentry.go:115.29,117.5 1 0
+github.com/muety/wakapi/config/sentry.go:122.38,123.38 1 0
+github.com/muety/wakapi/config/sentry.go:123.38,125.6 1 0
+github.com/muety/wakapi/config/sentry.go:127.39,129.5 1 0
+github.com/muety/wakapi/config/sentry.go:132.79,133.27 1 0
+github.com/muety/wakapi/config/sentry.go:140.4,140.16 1 0
+github.com/muety/wakapi/config/sentry.go:133.27,134.84 1 0
+github.com/muety/wakapi/config/sentry.go:134.84,135.42 1 0
+github.com/muety/wakapi/config/sentry.go:135.42,137.7 1 0
+github.com/muety/wakapi/config/sentry.go:142.17,144.3 1 0
+github.com/muety/wakapi/config/sentry.go:147.49,151.51 2 0
+github.com/muety/wakapi/config/sentry.go:154.2,154.12 1 0
+github.com/muety/wakapi/config/sentry.go:151.51,153.3 1 0
+github.com/muety/wakapi/config/utils.go:5.78,7.22 2 0
+github.com/muety/wakapi/config/utils.go:13.2,13.11 1 0
+github.com/muety/wakapi/config/utils.go:7.22,8.18 1 0
+github.com/muety/wakapi/config/utils.go:11.3,11.12 1 0
+github.com/muety/wakapi/config/utils.go:8.18,10.4 1 0
 github.com/muety/wakapi/config/config.go:157.64,159.2 1 0
 github.com/muety/wakapi/config/config.go:161.59,163.2 1 0
 github.com/muety/wakapi/config/config.go:165.82,175.2 1 0
@@ -423,196 +461,6 @@ github.com/muety/wakapi/config/eventbus.go:30.26,32.2 1 0
 github.com/muety/wakapi/config/fs.go:9.56,10.19 1 0
 github.com/muety/wakapi/config/fs.go:13.2,13.19 1 0
 github.com/muety/wakapi/config/fs.go:10.19,12.3 1 0
-github.com/muety/wakapi/config/sentry.go:22.35,24.2 1 0
-github.com/muety/wakapi/config/sentry.go:26.62,29.2 2 0
-github.com/muety/wakapi/config/sentry.go:39.33,46.2 2 0
-github.com/muety/wakapi/config/sentry.go:48.79,51.2 2 0
-github.com/muety/wakapi/config/sentry.go:53.72,57.2 3 0
-github.com/muety/wakapi/config/sentry.go:59.71,63.2 3 0
-github.com/muety/wakapi/config/sentry.go:65.71,69.2 3 0
-github.com/muety/wakapi/config/sentry.go:71.72,75.2 3 0
-github.com/muety/wakapi/config/sentry.go:77.72,81.2 3 0
-github.com/muety/wakapi/config/sentry.go:83.67,88.18 4 0
-github.com/muety/wakapi/config/sentry.go:100.2,100.28 1 0
-github.com/muety/wakapi/config/sentry.go:88.18,89.65 1 0
-github.com/muety/wakapi/config/sentry.go:89.65,92.42 3 0
-github.com/muety/wakapi/config/sentry.go:95.4,96.10 2 0
-github.com/muety/wakapi/config/sentry.go:92.42,94.5 1 0
-github.com/muety/wakapi/config/sentry.go:110.50,114.91 1 0
-github.com/muety/wakapi/config/sentry.go:114.91,115.29 1 0
-github.com/muety/wakapi/config/sentry.go:119.4,122.38 3 0
-github.com/muety/wakapi/config/sentry.go:127.4,127.39 1 0
-github.com/muety/wakapi/config/sentry.go:130.4,130.69 1 0
-github.com/muety/wakapi/config/sentry.go:115.29,117.5 1 0
-github.com/muety/wakapi/config/sentry.go:122.38,123.38 1 0
-github.com/muety/wakapi/config/sentry.go:123.38,125.6 1 0
-github.com/muety/wakapi/config/sentry.go:127.39,129.5 1 0
-github.com/muety/wakapi/config/sentry.go:132.79,133.27 1 0
-github.com/muety/wakapi/config/sentry.go:140.4,140.16 1 0
-github.com/muety/wakapi/config/sentry.go:133.27,134.84 1 0
-github.com/muety/wakapi/config/sentry.go:134.84,135.42 1 0
-github.com/muety/wakapi/config/sentry.go:135.42,137.7 1 0
-github.com/muety/wakapi/config/sentry.go:142.17,144.3 1 0
-github.com/muety/wakapi/config/sentry.go:147.49,151.51 2 0
-github.com/muety/wakapi/config/sentry.go:154.2,154.12 1 0
-github.com/muety/wakapi/config/sentry.go:151.51,153.3 1 0
-github.com/muety/wakapi/config/utils.go:5.78,7.22 2 0
-github.com/muety/wakapi/config/utils.go:13.2,13.11 1 0
-github.com/muety/wakapi/config/utils.go:7.22,8.18 1 0
-github.com/muety/wakapi/config/utils.go:11.3,11.12 1 0
-github.com/muety/wakapi/config/utils.go:8.18,10.4 1 0
-github.com/muety/wakapi/utils/common.go:18.73,19.58 1 0
-github.com/muety/wakapi/utils/common.go:22.2,22.87 1 0
-github.com/muety/wakapi/utils/common.go:25.2,25.64 1 0
-github.com/muety/wakapi/utils/common.go:19.58,21.3 1 0
-github.com/muety/wakapi/utils/common.go:22.87,24.3 1 0
-github.com/muety/wakapi/utils/common.go:28.40,30.2 1 0
-github.com/muety/wakapi/utils/common.go:32.44,34.2 1 0
-github.com/muety/wakapi/utils/common.go:36.49,38.2 1 0
-github.com/muety/wakapi/utils/common.go:40.45,42.2 1 0
-github.com/muety/wakapi/utils/common.go:44.24,46.2 1 0
-github.com/muety/wakapi/utils/common.go:48.56,51.45 3 1
-github.com/muety/wakapi/utils/common.go:54.2,54.40 1 1
-github.com/muety/wakapi/utils/common.go:51.45,53.3 1 1
-github.com/muety/wakapi/utils/db.go:8.34,9.37 1 0
-github.com/muety/wakapi/utils/db.go:17.2,18.14 2 0
-github.com/muety/wakapi/utils/db.go:9.37,11.110 2 0
-github.com/muety/wakapi/utils/db.go:15.3,15.20 1 0
-github.com/muety/wakapi/utils/db.go:11.110,14.4 2 0
-github.com/muety/wakapi/utils/db.go:21.39,22.37 1 0
-github.com/muety/wakapi/utils/db.go:30.2,31.14 2 0
-github.com/muety/wakapi/utils/db.go:22.37,24.119 2 0
-github.com/muety/wakapi/utils/db.go:28.3,28.20 1 0
-github.com/muety/wakapi/utils/db.go:24.119,27.4 2 0
-github.com/muety/wakapi/utils/http.go:9.90,12.58 3 0
-github.com/muety/wakapi/utils/http.go:12.58,14.3 1 0
-github.com/muety/wakapi/utils/summary.go:10.66,11.40 1 0
-github.com/muety/wakapi/utils/summary.go:16.2,16.48 1 0
-github.com/muety/wakapi/utils/summary.go:11.40,12.27 1 0
-github.com/muety/wakapi/utils/summary.go:12.27,14.4 1 0
-github.com/muety/wakapi/utils/summary.go:19.88,22.2 2 0
-github.com/muety/wakapi/utils/summary.go:24.95,26.16 2 0
-github.com/muety/wakapi/utils/summary.go:29.2,29.38 1 0
-github.com/muety/wakapi/utils/summary.go:26.16,28.3 1 0
-github.com/muety/wakapi/utils/summary.go:32.105,36.18 3 0
-github.com/muety/wakapi/utils/summary.go:71.2,71.22 1 0
-github.com/muety/wakapi/utils/summary.go:37.28,38.26 1 0
-github.com/muety/wakapi/utils/summary.go:39.32,41.24 2 0
-github.com/muety/wakapi/utils/summary.go:42.31,43.29 1 0
-github.com/muety/wakapi/utils/summary.go:44.31,46.27 2 0
-github.com/muety/wakapi/utils/summary.go:47.32,48.30 1 0
-github.com/muety/wakapi/utils/summary.go:49.32,51.28 2 0
-github.com/muety/wakapi/utils/summary.go:52.31,53.29 1 0
-github.com/muety/wakapi/utils/summary.go:54.32,55.31 1 0
-github.com/muety/wakapi/utils/summary.go:56.41,58.42 2 0
-github.com/muety/wakapi/utils/summary.go:59.33,60.32 1 0
-github.com/muety/wakapi/utils/summary.go:61.33,62.32 1 0
-github.com/muety/wakapi/utils/summary.go:63.35,64.32 1 0
-github.com/muety/wakapi/utils/summary.go:65.26,66.21 1 0
-github.com/muety/wakapi/utils/summary.go:67.10,68.39 1 0
-github.com/muety/wakapi/utils/summary.go:74.73,81.56 5 0
-github.com/muety/wakapi/utils/summary.go:97.2,107.8 3 0
-github.com/muety/wakapi/utils/summary.go:81.56,83.3 1 0
-github.com/muety/wakapi/utils/summary.go:83.8,83.54 1 0
-github.com/muety/wakapi/utils/summary.go:83.54,85.3 1 0
-github.com/muety/wakapi/utils/summary.go:85.8,87.17 2 0
-github.com/muety/wakapi/utils/summary.go:91.3,92.17 2 0
-github.com/muety/wakapi/utils/summary.go:87.17,89.4 1 0
-github.com/muety/wakapi/utils/summary.go:92.17,94.4 1 0
-github.com/muety/wakapi/utils/summary.go:110.59,112.48 2 0
-github.com/muety/wakapi/utils/summary.go:115.2,115.49 1 0
-github.com/muety/wakapi/utils/summary.go:118.2,118.47 1 0
-github.com/muety/wakapi/utils/summary.go:121.2,121.48 1 0
-github.com/muety/wakapi/utils/summary.go:124.2,124.57 1 0
-github.com/muety/wakapi/utils/summary.go:127.2,127.46 1 0
-github.com/muety/wakapi/utils/summary.go:130.2,130.47 1 0
-github.com/muety/wakapi/utils/summary.go:133.2,133.16 1 0
-github.com/muety/wakapi/utils/summary.go:112.48,114.3 1 0
-github.com/muety/wakapi/utils/summary.go:115.49,117.3 1 0
-github.com/muety/wakapi/utils/summary.go:118.47,120.3 1 0
-github.com/muety/wakapi/utils/summary.go:121.48,123.3 1 0
-github.com/muety/wakapi/utils/summary.go:124.57,126.3 1 0
-github.com/muety/wakapi/utils/summary.go:127.46,129.3 1 0
-github.com/muety/wakapi/utils/summary.go:130.47,132.3 1 0
-github.com/muety/wakapi/utils/summary.go:136.48,140.51 2 0
-github.com/muety/wakapi/utils/summary.go:143.2,143.12 1 0
-github.com/muety/wakapi/utils/summary.go:140.51,142.3 1 0
-github.com/muety/wakapi/utils/color.go:8.90,10.32 2 0
-github.com/muety/wakapi/utils/color.go:15.2,15.15 1 0
-github.com/muety/wakapi/utils/color.go:10.32,11.50 1 0
-github.com/muety/wakapi/utils/color.go:11.50,13.4 1 0
-github.com/muety/wakapi/utils/date.go:14.43,16.2 1 1
-github.com/muety/wakapi/utils/date.go:18.48,20.2 1 0
-github.com/muety/wakapi/utils/date.go:22.41,24.21 2 1
-github.com/muety/wakapi/utils/date.go:27.2,27.23 1 1
-github.com/muety/wakapi/utils/date.go:24.21,26.3 1 0
-github.com/muety/wakapi/utils/date.go:30.46,32.2 1 0
-github.com/muety/wakapi/utils/date.go:34.51,36.2 1 0
-github.com/muety/wakapi/utils/date.go:38.44,41.2 2 1
-github.com/muety/wakapi/utils/date.go:43.52,45.2 1 0
-github.com/muety/wakapi/utils/date.go:47.45,49.2 1 0
-github.com/muety/wakapi/utils/date.go:51.51,53.2 1 0
-github.com/muety/wakapi/utils/date.go:55.44,57.2 1 0
-github.com/muety/wakapi/utils/date.go:60.42,62.2 1 1
-github.com/muety/wakapi/utils/date.go:65.46,67.2 1 0
-github.com/muety/wakapi/utils/date.go:70.41,72.21 2 1
-github.com/muety/wakapi/utils/date.go:75.2,75.33 1 1
-github.com/muety/wakapi/utils/date.go:72.21,74.3 1 1
-github.com/muety/wakapi/utils/date.go:79.63,81.2 1 0
-github.com/muety/wakapi/utils/date.go:84.62,90.2 5 0
-github.com/muety/wakapi/utils/date.go:93.67,96.33 2 1
-github.com/muety/wakapi/utils/date.go:105.2,105.18 1 1
-github.com/muety/wakapi/utils/date.go:96.33,98.19 2 1
-github.com/muety/wakapi/utils/date.go:101.3,102.10 2 1
-github.com/muety/wakapi/utils/date.go:98.19,100.4 1 1
-github.com/muety/wakapi/utils/date.go:108.50,114.2 5 0
-github.com/muety/wakapi/utils/date.go:117.36,120.2 2 0
-github.com/muety/wakapi/utils/date.go:123.79,126.36 3 1
-github.com/muety/wakapi/utils/date.go:130.2,130.21 1 1
-github.com/muety/wakapi/utils/date.go:134.2,134.21 1 1
-github.com/muety/wakapi/utils/date.go:138.2,138.13 1 1
-github.com/muety/wakapi/utils/date.go:126.36,129.3 2 0
-github.com/muety/wakapi/utils/date.go:130.21,133.3 2 1
-github.com/muety/wakapi/utils/date.go:134.21,137.3 2 1
-github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0
-github.com/muety/wakapi/utils/template.go:13.41,15.16 2 0
-github.com/muety/wakapi/utils/template.go:18.2,18.23 1 0
-github.com/muety/wakapi/utils/template.go:15.16,17.3 1 0
-github.com/muety/wakapi/utils/template.go:21.37,22.30 1 0
-github.com/muety/wakapi/utils/template.go:25.2,25.10 1 0
-github.com/muety/wakapi/utils/template.go:22.30,24.3 1 0
-github.com/muety/wakapi/utils/template.go:28.83,33.16 4 0
-github.com/muety/wakapi/utils/template.go:37.2,37.29 1 0
-github.com/muety/wakapi/utils/template.go:62.2,62.23 1 0
-github.com/muety/wakapi/utils/template.go:33.16,35.3 1 0
-github.com/muety/wakapi/utils/template.go:37.29,39.51 2 0
-github.com/muety/wakapi/utils/template.go:43.3,44.17 2 0
-github.com/muety/wakapi/utils/template.go:47.3,48.17 2 0
-github.com/muety/wakapi/utils/template.go:52.3,55.17 3 0
-github.com/muety/wakapi/utils/template.go:59.3,59.27 1 0
-github.com/muety/wakapi/utils/template.go:39.51,40.12 1 0
-github.com/muety/wakapi/utils/template.go:44.17,46.4 1 0
-github.com/muety/wakapi/utils/template.go:48.17,50.4 1 0
-github.com/muety/wakapi/utils/template.go:55.17,57.4 1 0
-github.com/muety/wakapi/utils/auth.go:16.79,18.54 2 0
-github.com/muety/wakapi/utils/auth.go:22.2,24.16 3 0
-github.com/muety/wakapi/utils/auth.go:28.2,30.45 3 0
-github.com/muety/wakapi/utils/auth.go:33.2,34.32 2 0
-github.com/muety/wakapi/utils/auth.go:18.54,20.3 1 0
-github.com/muety/wakapi/utils/auth.go:24.16,26.3 1 0
-github.com/muety/wakapi/utils/auth.go:30.45,32.3 1 0
-github.com/muety/wakapi/utils/auth.go:37.65,39.85 2 0
-github.com/muety/wakapi/utils/auth.go:43.2,44.30 2 0
-github.com/muety/wakapi/utils/auth.go:39.85,41.3 1 0
-github.com/muety/wakapi/utils/auth.go:47.94,49.16 2 0
-github.com/muety/wakapi/utils/auth.go:53.2,53.107 1 0
-github.com/muety/wakapi/utils/auth.go:57.2,57.22 1 0
-github.com/muety/wakapi/utils/auth.go:49.16,51.3 1 0
-github.com/muety/wakapi/utils/auth.go:53.107,55.3 1 0
-github.com/muety/wakapi/utils/auth.go:60.56,64.2 3 0
-github.com/muety/wakapi/utils/auth.go:66.55,69.16 3 0
-github.com/muety/wakapi/utils/auth.go:72.2,72.16 1 0
-github.com/muety/wakapi/utils/auth.go:69.16,71.3 1 0
 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:30.112,37.2 1 0
 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:39.59,43.2 2 0
 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:55.68,60.79 4 0
@@ -646,22 +494,6 @@ github.com/muety/wakapi/routes/compat/shields/v1/badge.go:167.2,167.36 1 0
 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:140.16,142.3 1 0
 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:151.29,153.3 1 0
 github.com/muety/wakapi/routes/compat/shields/v1/badge.go:163.16,165.3 1 0
-github.com/muety/wakapi/middlewares/principal.go:15.62,17.2 1 0
-github.com/muety/wakapi/middlewares/principal.go:19.58,21.2 1 0
-github.com/muety/wakapi/middlewares/principal.go:42.71,43.43 1 0
-github.com/muety/wakapi/middlewares/principal.go:43.43,45.3 1 0
-github.com/muety/wakapi/middlewares/principal.go:48.81,51.2 2 0
-github.com/muety/wakapi/middlewares/principal.go:53.55,54.52 1 0
-github.com/muety/wakapi/middlewares/principal.go:54.52,56.3 1 0
-github.com/muety/wakapi/middlewares/principal.go:59.49,60.52 1 0
-github.com/muety/wakapi/middlewares/principal.go:63.2,63.12 1 0
-github.com/muety/wakapi/middlewares/principal.go:60.52,62.3 1 0
-github.com/muety/wakapi/middlewares/security.go:19.62,20.43 1 0
-github.com/muety/wakapi/middlewares/security.go:20.43,22.3 1 0
-github.com/muety/wakapi/middlewares/security.go:25.80,26.36 1 0
-github.com/muety/wakapi/middlewares/security.go:31.2,31.27 1 0
-github.com/muety/wakapi/middlewares/security.go:26.36,27.30 1 0
-github.com/muety/wakapi/middlewares/security.go:27.30,29.4 1 0
 github.com/muety/wakapi/middlewares/sentry.go:15.60,16.43 1 0
 github.com/muety/wakapi/middlewares/sentry.go:16.43,20.3 1 0
 github.com/muety/wakapi/middlewares/sentry.go:23.78,26.54 3 0
@@ -736,6 +568,235 @@ github.com/muety/wakapi/middlewares/logging.go:142.36,144.2 1 0
 github.com/muety/wakapi/middlewares/logging.go:145.42,147.2 1 0
 github.com/muety/wakapi/middlewares/logging.go:148.40,150.2 1 0
 github.com/muety/wakapi/middlewares/logging.go:151.52,153.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:15.62,17.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:19.58,21.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:42.71,43.43 1 0
+github.com/muety/wakapi/middlewares/principal.go:43.43,45.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:48.81,51.2 2 0
+github.com/muety/wakapi/middlewares/principal.go:53.55,54.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:54.52,56.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:59.49,60.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:63.2,63.12 1 0
+github.com/muety/wakapi/middlewares/principal.go:60.52,62.3 1 0
+github.com/muety/wakapi/middlewares/security.go:19.62,20.43 1 0
+github.com/muety/wakapi/middlewares/security.go:20.43,22.3 1 0
+github.com/muety/wakapi/middlewares/security.go:25.80,26.36 1 0
+github.com/muety/wakapi/middlewares/security.go:31.2,31.27 1 0
+github.com/muety/wakapi/middlewares/security.go:26.36,27.30 1 0
+github.com/muety/wakapi/middlewares/security.go:27.30,29.4 1 0
+github.com/muety/wakapi/utils/date.go:14.43,16.2 1 1
+github.com/muety/wakapi/utils/date.go:18.48,20.2 1 0
+github.com/muety/wakapi/utils/date.go:22.41,24.21 2 1
+github.com/muety/wakapi/utils/date.go:27.2,27.23 1 1
+github.com/muety/wakapi/utils/date.go:24.21,26.3 1 0
+github.com/muety/wakapi/utils/date.go:30.46,32.2 1 0
+github.com/muety/wakapi/utils/date.go:34.51,36.2 1 0
+github.com/muety/wakapi/utils/date.go:38.44,41.2 2 1
+github.com/muety/wakapi/utils/date.go:43.52,45.2 1 0
+github.com/muety/wakapi/utils/date.go:47.45,49.2 1 0
+github.com/muety/wakapi/utils/date.go:51.51,53.2 1 0
+github.com/muety/wakapi/utils/date.go:55.44,57.2 1 0
+github.com/muety/wakapi/utils/date.go:60.42,62.2 1 1
+github.com/muety/wakapi/utils/date.go:65.46,67.2 1 0
+github.com/muety/wakapi/utils/date.go:70.41,72.21 2 1
+github.com/muety/wakapi/utils/date.go:75.2,75.33 1 1
+github.com/muety/wakapi/utils/date.go:72.21,74.3 1 1
+github.com/muety/wakapi/utils/date.go:79.63,81.2 1 0
+github.com/muety/wakapi/utils/date.go:84.62,90.2 5 0
+github.com/muety/wakapi/utils/date.go:93.67,96.33 2 1
+github.com/muety/wakapi/utils/date.go:105.2,105.18 1 1
+github.com/muety/wakapi/utils/date.go:96.33,98.19 2 1
+github.com/muety/wakapi/utils/date.go:101.3,102.10 2 1
+github.com/muety/wakapi/utils/date.go:98.19,100.4 1 1
+github.com/muety/wakapi/utils/date.go:108.50,114.2 5 0
+github.com/muety/wakapi/utils/date.go:117.36,120.2 2 0
+github.com/muety/wakapi/utils/date.go:123.79,126.36 3 1
+github.com/muety/wakapi/utils/date.go:130.2,130.21 1 1
+github.com/muety/wakapi/utils/date.go:134.2,134.21 1 1
+github.com/muety/wakapi/utils/date.go:138.2,138.13 1 1
+github.com/muety/wakapi/utils/date.go:126.36,129.3 2 0
+github.com/muety/wakapi/utils/date.go:130.21,133.3 2 1
+github.com/muety/wakapi/utils/date.go:134.21,137.3 2 1
+github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0
+github.com/muety/wakapi/utils/summary.go:10.66,11.40 1 0
+github.com/muety/wakapi/utils/summary.go:16.2,16.48 1 0
+github.com/muety/wakapi/utils/summary.go:11.40,12.27 1 0
+github.com/muety/wakapi/utils/summary.go:12.27,14.4 1 0
+github.com/muety/wakapi/utils/summary.go:19.88,22.2 2 0
+github.com/muety/wakapi/utils/summary.go:24.95,26.16 2 0
+github.com/muety/wakapi/utils/summary.go:29.2,29.38 1 0
+github.com/muety/wakapi/utils/summary.go:26.16,28.3 1 0
+github.com/muety/wakapi/utils/summary.go:32.105,36.18 3 0
+github.com/muety/wakapi/utils/summary.go:71.2,71.22 1 0
+github.com/muety/wakapi/utils/summary.go:37.28,38.26 1 0
+github.com/muety/wakapi/utils/summary.go:39.32,41.24 2 0
+github.com/muety/wakapi/utils/summary.go:42.31,43.29 1 0
+github.com/muety/wakapi/utils/summary.go:44.31,46.27 2 0
+github.com/muety/wakapi/utils/summary.go:47.32,48.30 1 0
+github.com/muety/wakapi/utils/summary.go:49.32,51.28 2 0
+github.com/muety/wakapi/utils/summary.go:52.31,53.29 1 0
+github.com/muety/wakapi/utils/summary.go:54.32,55.31 1 0
+github.com/muety/wakapi/utils/summary.go:56.41,58.42 2 0
+github.com/muety/wakapi/utils/summary.go:59.33,60.32 1 0
+github.com/muety/wakapi/utils/summary.go:61.33,62.32 1 0
+github.com/muety/wakapi/utils/summary.go:63.35,64.32 1 0
+github.com/muety/wakapi/utils/summary.go:65.26,66.21 1 0
+github.com/muety/wakapi/utils/summary.go:67.10,68.39 1 0
+github.com/muety/wakapi/utils/summary.go:74.73,81.56 5 0
+github.com/muety/wakapi/utils/summary.go:97.2,107.8 3 0
+github.com/muety/wakapi/utils/summary.go:81.56,83.3 1 0
+github.com/muety/wakapi/utils/summary.go:83.8,83.54 1 0
+github.com/muety/wakapi/utils/summary.go:83.54,85.3 1 0
+github.com/muety/wakapi/utils/summary.go:85.8,87.17 2 0
+github.com/muety/wakapi/utils/summary.go:91.3,92.17 2 0
+github.com/muety/wakapi/utils/summary.go:87.17,89.4 1 0
+github.com/muety/wakapi/utils/summary.go:92.17,94.4 1 0
+github.com/muety/wakapi/utils/summary.go:110.59,112.48 2 0
+github.com/muety/wakapi/utils/summary.go:115.2,115.49 1 0
+github.com/muety/wakapi/utils/summary.go:118.2,118.47 1 0
+github.com/muety/wakapi/utils/summary.go:121.2,121.48 1 0
+github.com/muety/wakapi/utils/summary.go:124.2,124.57 1 0
+github.com/muety/wakapi/utils/summary.go:127.2,127.46 1 0
+github.com/muety/wakapi/utils/summary.go:130.2,130.47 1 0
+github.com/muety/wakapi/utils/summary.go:133.2,133.16 1 0
+github.com/muety/wakapi/utils/summary.go:112.48,114.3 1 0
+github.com/muety/wakapi/utils/summary.go:115.49,117.3 1 0
+github.com/muety/wakapi/utils/summary.go:118.47,120.3 1 0
+github.com/muety/wakapi/utils/summary.go:121.48,123.3 1 0
+github.com/muety/wakapi/utils/summary.go:124.57,126.3 1 0
+github.com/muety/wakapi/utils/summary.go:127.46,129.3 1 0
+github.com/muety/wakapi/utils/summary.go:130.47,132.3 1 0
+github.com/muety/wakapi/utils/summary.go:136.48,140.51 2 0
+github.com/muety/wakapi/utils/summary.go:143.2,143.12 1 0
+github.com/muety/wakapi/utils/summary.go:140.51,142.3 1 0
+github.com/muety/wakapi/utils/auth.go:16.79,18.54 2 0
+github.com/muety/wakapi/utils/auth.go:22.2,24.16 3 0
+github.com/muety/wakapi/utils/auth.go:28.2,30.45 3 0
+github.com/muety/wakapi/utils/auth.go:33.2,34.32 2 0
+github.com/muety/wakapi/utils/auth.go:18.54,20.3 1 0
+github.com/muety/wakapi/utils/auth.go:24.16,26.3 1 0
+github.com/muety/wakapi/utils/auth.go:30.45,32.3 1 0
+github.com/muety/wakapi/utils/auth.go:37.65,39.85 2 0
+github.com/muety/wakapi/utils/auth.go:43.2,44.30 2 0
+github.com/muety/wakapi/utils/auth.go:39.85,41.3 1 0
+github.com/muety/wakapi/utils/auth.go:47.94,49.16 2 0
+github.com/muety/wakapi/utils/auth.go:53.2,53.107 1 0
+github.com/muety/wakapi/utils/auth.go:57.2,57.22 1 0
+github.com/muety/wakapi/utils/auth.go:49.16,51.3 1 0
+github.com/muety/wakapi/utils/auth.go:53.107,55.3 1 0
+github.com/muety/wakapi/utils/auth.go:60.56,64.2 3 0
+github.com/muety/wakapi/utils/auth.go:66.55,69.16 3 0
+github.com/muety/wakapi/utils/auth.go:72.2,72.16 1 0
+github.com/muety/wakapi/utils/auth.go:69.16,71.3 1 0
+github.com/muety/wakapi/utils/color.go:8.90,10.32 2 0
+github.com/muety/wakapi/utils/color.go:15.2,15.15 1 0
+github.com/muety/wakapi/utils/color.go:10.32,11.50 1 0
+github.com/muety/wakapi/utils/color.go:11.50,13.4 1 0
+github.com/muety/wakapi/utils/common.go:18.73,19.58 1 0
+github.com/muety/wakapi/utils/common.go:22.2,22.87 1 0
+github.com/muety/wakapi/utils/common.go:25.2,25.64 1 0
+github.com/muety/wakapi/utils/common.go:19.58,21.3 1 0
+github.com/muety/wakapi/utils/common.go:22.87,24.3 1 0
+github.com/muety/wakapi/utils/common.go:28.40,30.2 1 0
+github.com/muety/wakapi/utils/common.go:32.44,34.2 1 0
+github.com/muety/wakapi/utils/common.go:36.49,38.2 1 0
+github.com/muety/wakapi/utils/common.go:40.45,42.2 1 0
+github.com/muety/wakapi/utils/common.go:44.24,46.2 1 0
+github.com/muety/wakapi/utils/common.go:48.56,51.45 3 1
+github.com/muety/wakapi/utils/common.go:54.2,54.40 1 1
+github.com/muety/wakapi/utils/common.go:51.45,53.3 1 1
+github.com/muety/wakapi/utils/db.go:8.34,9.37 1 0
+github.com/muety/wakapi/utils/db.go:17.2,18.14 2 0
+github.com/muety/wakapi/utils/db.go:9.37,11.110 2 0
+github.com/muety/wakapi/utils/db.go:15.3,15.20 1 0
+github.com/muety/wakapi/utils/db.go:11.110,14.4 2 0
+github.com/muety/wakapi/utils/db.go:21.39,22.37 1 0
+github.com/muety/wakapi/utils/db.go:30.2,31.14 2 0
+github.com/muety/wakapi/utils/db.go:22.37,24.119 2 0
+github.com/muety/wakapi/utils/db.go:28.3,28.20 1 0
+github.com/muety/wakapi/utils/db.go:24.119,27.4 2 0
+github.com/muety/wakapi/utils/http.go:9.90,12.58 3 0
+github.com/muety/wakapi/utils/http.go:12.58,14.3 1 0
+github.com/muety/wakapi/utils/template.go:13.41,15.16 2 0
+github.com/muety/wakapi/utils/template.go:18.2,18.23 1 0
+github.com/muety/wakapi/utils/template.go:15.16,17.3 1 0
+github.com/muety/wakapi/utils/template.go:21.37,22.30 1 0
+github.com/muety/wakapi/utils/template.go:25.2,25.10 1 0
+github.com/muety/wakapi/utils/template.go:22.30,24.3 1 0
+github.com/muety/wakapi/utils/template.go:28.83,33.16 4 0
+github.com/muety/wakapi/utils/template.go:37.2,37.29 1 0
+github.com/muety/wakapi/utils/template.go:62.2,62.23 1 0
+github.com/muety/wakapi/utils/template.go:33.16,35.3 1 0
+github.com/muety/wakapi/utils/template.go:37.29,39.51 2 0
+github.com/muety/wakapi/utils/template.go:43.3,44.17 2 0
+github.com/muety/wakapi/utils/template.go:47.3,48.17 2 0
+github.com/muety/wakapi/utils/template.go:52.3,55.17 3 0
+github.com/muety/wakapi/utils/template.go:59.3,59.27 1 0
+github.com/muety/wakapi/utils/template.go:39.51,40.12 1 0
+github.com/muety/wakapi/utils/template.go:44.17,46.4 1 0
+github.com/muety/wakapi/utils/template.go:48.17,50.4 1 0
+github.com/muety/wakapi/utils/template.go:55.17,57.4 1 0
+github.com/muety/wakapi/services/alias.go:19.77,24.2 1 1
+github.com/muety/wakapi/services/alias.go:28.60,29.43 1 1
+github.com/muety/wakapi/services/alias.go:32.2,32.14 1 1
+github.com/muety/wakapi/services/alias.go:29.43,31.3 1 1
+github.com/muety/wakapi/services/alias.go:35.62,37.16 2 1
+github.com/muety/wakapi/services/alias.go:40.2,40.12 1 1
+github.com/muety/wakapi/services/alias.go:37.16,39.3 1 1
+github.com/muety/wakapi/services/alias.go:43.59,44.51 1 1
+github.com/muety/wakapi/services/alias.go:44.51,46.3 1 0
+github.com/muety/wakapi/services/alias.go:49.76,50.32 1 0
+github.com/muety/wakapi/services/alias.go:53.2,53.49 1 0
+github.com/muety/wakapi/services/alias.go:50.32,52.3 1 0
+github.com/muety/wakapi/services/alias.go:53.49,55.3 1 0
+github.com/muety/wakapi/services/alias.go:55.8,57.3 1 0
+github.com/muety/wakapi/services/alias.go:60.102,61.38 1 0
+github.com/muety/wakapi/services/alias.go:64.2,64.39 1 0
+github.com/muety/wakapi/services/alias.go:61.38,63.3 1 0
+github.com/muety/wakapi/services/alias.go:67.113,68.38 1 0
+github.com/muety/wakapi/services/alias.go:71.2,71.39 1 0
+github.com/muety/wakapi/services/alias.go:68.38,70.3 1 0
+github.com/muety/wakapi/services/alias.go:74.108,75.32 1 1
+github.com/muety/wakapi/services/alias.go:79.2,79.49 1 1
+github.com/muety/wakapi/services/alias.go:87.2,87.19 1 1
+github.com/muety/wakapi/services/alias.go:75.32,77.3 1 1
+github.com/muety/wakapi/services/alias.go:79.49,80.47 1 1
+github.com/muety/wakapi/services/alias.go:80.47,81.49 1 1
+github.com/muety/wakapi/services/alias.go:81.49,83.5 1 1
+github.com/muety/wakapi/services/alias.go:90.77,92.16 2 0
+github.com/muety/wakapi/services/alias.go:96.2,100.20 3 0
+github.com/muety/wakapi/services/alias.go:92.16,94.3 1 0
+github.com/muety/wakapi/services/alias.go:103.60,104.24 1 0
+github.com/muety/wakapi/services/alias.go:107.2,110.16 2 0
+github.com/muety/wakapi/services/alias.go:114.2,116.12 2 0
+github.com/muety/wakapi/services/alias.go:104.24,106.3 1 0
+github.com/muety/wakapi/services/alias.go:110.16,112.3 1 0
+github.com/muety/wakapi/services/alias.go:119.69,123.28 3 0
+github.com/muety/wakapi/services/alias.go:131.2,134.16 2 0
+github.com/muety/wakapi/services/alias.go:140.2,140.31 1 0
+github.com/muety/wakapi/services/alias.go:144.2,144.12 1 0
+github.com/muety/wakapi/services/alias.go:123.28,124.21 1 0
+github.com/muety/wakapi/services/alias.go:127.3,128.16 2 0
+github.com/muety/wakapi/services/alias.go:124.21,126.4 1 0
+github.com/muety/wakapi/services/alias.go:134.16,135.29 1 0
+github.com/muety/wakapi/services/alias.go:135.29,137.4 1 0
+github.com/muety/wakapi/services/alias.go:140.31,142.3 1 0
+github.com/muety/wakapi/services/alias.go:147.74,148.14 1 0
+github.com/muety/wakapi/services/alias.go:148.14,149.57 1 0
+github.com/muety/wakapi/services/alias.go:149.57,153.4 3 0
+github.com/muety/wakapi/services/alias.go:154.8,155.57 1 0
+github.com/muety/wakapi/services/alias.go:155.57,157.48 2 0
+github.com/muety/wakapi/services/alias.go:162.4,162.52 1 0
+github.com/muety/wakapi/services/alias.go:157.48,158.26 1 0
+github.com/muety/wakapi/services/alias.go:158.26,160.6 1 0
+github.com/muety/wakapi/services/alias.go:167.116,168.32 1 0
+github.com/muety/wakapi/services/alias.go:171.2,171.49 1 0
+github.com/muety/wakapi/services/alias.go:168.32,170.3 1 0
+github.com/muety/wakapi/services/alias.go:171.49,173.47 2 0
+github.com/muety/wakapi/services/alias.go:178.3,178.30 1 0
+github.com/muety/wakapi/services/alias.go:173.47,174.16 1 0
+github.com/muety/wakapi/services/alias.go:174.16,176.5 1 0
+github.com/muety/wakapi/services/alias.go:179.8,181.3 1 0
 github.com/muety/wakapi/services/duration.go:16.78,22.2 2 1
 github.com/muety/wakapi/services/duration.go:24.123,27.42 2 1
 github.com/muety/wakapi/services/duration.go:33.2,34.16 2 1
@@ -772,6 +833,27 @@ github.com/muety/wakapi/services/key_value.go:33.2,33.11 1 0
 github.com/muety/wakapi/services/key_value.go:27.16,32.3 1 0
 github.com/muety/wakapi/services/key_value.go:36.72,38.2 1 0
 github.com/muety/wakapi/services/key_value.go:40.60,42.2 1 0
+github.com/muety/wakapi/services/misc.go:21.126,28.2 1 0
+github.com/muety/wakapi/services/misc.go:40.50,42.48 1 0
+github.com/muety/wakapi/services/misc.go:46.2,48.19 3 0
+github.com/muety/wakapi/services/misc.go:42.48,44.3 1 0
+github.com/muety/wakapi/services/misc.go:51.51,53.16 2 0
+github.com/muety/wakapi/services/misc.go:57.2,60.26 3 0
+github.com/muety/wakapi/services/misc.go:66.2,68.40 2 0
+github.com/muety/wakapi/services/misc.go:73.2,75.33 3 0
+github.com/muety/wakapi/services/misc.go:79.2,84.17 2 0
+github.com/muety/wakapi/services/misc.go:88.2,91.17 1 0
+github.com/muety/wakapi/services/misc.go:95.2,95.12 1 0
+github.com/muety/wakapi/services/misc.go:53.16,55.3 1 0
+github.com/muety/wakapi/services/misc.go:60.26,65.3 1 0
+github.com/muety/wakapi/services/misc.go:68.40,70.3 1 0
+github.com/muety/wakapi/services/misc.go:75.33,78.3 2 0
+github.com/muety/wakapi/services/misc.go:84.17,86.3 1 0
+github.com/muety/wakapi/services/misc.go:91.17,93.3 1 0
+github.com/muety/wakapi/services/misc.go:98.116,99.24 1 0
+github.com/muety/wakapi/services/misc.go:99.24,100.156 1 0
+github.com/muety/wakapi/services/misc.go:100.156,102.4 1 0
+github.com/muety/wakapi/services/misc.go:102.9,107.4 1 0
 github.com/muety/wakapi/services/project_label.go:21.111,28.2 1 0
 github.com/muety/wakapi/services/project_label.go:30.80,32.2 1 0
 github.com/muety/wakapi/services/project_label.go:34.90,35.51 1 0
@@ -780,15 +862,15 @@ github.com/muety/wakapi/services/project_label.go:43.2,44.20 2 0
 github.com/muety/wakapi/services/project_label.go:35.51,37.3 1 0
 github.com/muety/wakapi/services/project_label.go:40.16,42.3 1 0
 github.com/muety/wakapi/services/project_label.go:48.108,50.16 2 0
-github.com/muety/wakapi/services/project_label.go:53.2,53.107 1 0
+github.com/muety/wakapi/services/project_label.go:53.2,53.112 1 0
 github.com/muety/wakapi/services/project_label.go:56.2,56.26 1 0
 github.com/muety/wakapi/services/project_label.go:50.16,52.3 1 0
-github.com/muety/wakapi/services/project_label.go:53.107,55.3 1 0
+github.com/muety/wakapi/services/project_label.go:53.112,55.3 1 0
 github.com/muety/wakapi/services/project_label.go:60.116,62.16 2 0
-github.com/muety/wakapi/services/project_label.go:65.2,65.107 1 0
+github.com/muety/wakapi/services/project_label.go:65.2,65.112 1 0
 github.com/muety/wakapi/services/project_label.go:68.2,68.26 1 0
 github.com/muety/wakapi/services/project_label.go:62.16,64.3 1 0
-github.com/muety/wakapi/services/project_label.go:65.107,67.3 1 0
+github.com/muety/wakapi/services/project_label.go:65.112,67.3 1 0
 github.com/muety/wakapi/services/project_label.go:71.98,73.16 2 0
 github.com/muety/wakapi/services/project_label.go:77.2,79.20 3 0
 github.com/muety/wakapi/services/project_label.go:73.16,75.3 1 0
@@ -798,35 +880,6 @@ github.com/muety/wakapi/services/project_label.go:83.24,85.3 1 0
 github.com/muety/wakapi/services/project_label.go:92.89,94.14 2 0
 github.com/muety/wakapi/services/project_label.go:97.2,100.4 1 0
 github.com/muety/wakapi/services/project_label.go:94.14,96.3 1 0
-github.com/muety/wakapi/services/report.go:30.122,44.33 4 0
-github.com/muety/wakapi/services/report.go:50.2,50.12 1 0
-github.com/muety/wakapi/services/report.go:44.33,45.31 1 0
-github.com/muety/wakapi/services/report.go:45.31,47.4 1 0
-github.com/muety/wakapi/services/report.go:53.38,57.16 3 0
-github.com/muety/wakapi/services/report.go:61.2,62.26 2 0
-github.com/muety/wakapi/services/report.go:57.16,59.3 1 0
-github.com/muety/wakapi/services/report.go:62.26,64.3 1 0
-github.com/muety/wakapi/services/report.go:69.61,74.22 3 0
-github.com/muety/wakapi/services/report.go:81.2,81.65 1 0
-github.com/muety/wakapi/services/report.go:98.2,98.24 1 0
-github.com/muety/wakapi/services/report.go:74.22,78.3 3 0
-github.com/muety/wakapi/services/report.go:81.65,91.47 3 0
-github.com/muety/wakapi/services/report.go:91.47,93.4 1 0
-github.com/muety/wakapi/services/report.go:93.9,95.4 1 0
-github.com/muety/wakapi/services/report.go:101.80,102.22 1 0
-github.com/muety/wakapi/services/report.go:107.2,107.29 1 0
-github.com/muety/wakapi/services/report.go:112.2,116.16 4 0
-github.com/muety/wakapi/services/report.go:121.2,128.65 2 0
-github.com/muety/wakapi/services/report.go:133.2,134.12 2 0
-github.com/muety/wakapi/services/report.go:102.22,105.3 2 0
-github.com/muety/wakapi/services/report.go:107.29,110.3 2 0
-github.com/muety/wakapi/services/report.go:116.16,119.3 2 0
-github.com/muety/wakapi/services/report.go:128.65,131.3 2 0
-github.com/muety/wakapi/services/report.go:137.63,138.41 1 0
-github.com/muety/wakapi/services/report.go:145.2,145.12 1 0
-github.com/muety/wakapi/services/report.go:138.41,139.30 1 0
-github.com/muety/wakapi/services/report.go:139.30,140.16 1 0
-github.com/muety/wakapi/services/report.go:140.16,142.5 1 0
 github.com/muety/wakapi/services/summary.go:29.189,41.33 3 1
 github.com/muety/wakapi/services/summary.go:52.2,52.12 1 1
 github.com/muety/wakapi/services/summary.go:41.33,42.31 1 1
@@ -997,69 +1050,6 @@ github.com/muety/wakapi/services/aggregation.go:164.27,166.3 1 0
 github.com/muety/wakapi/services/aggregation.go:169.83,184.41 5 0
 github.com/muety/wakapi/services/aggregation.go:184.41,194.3 3 0
 github.com/muety/wakapi/services/aggregation.go:197.34,200.2 2 0
-github.com/muety/wakapi/services/alias.go:19.77,24.2 1 1
-github.com/muety/wakapi/services/alias.go:28.60,29.43 1 1
-github.com/muety/wakapi/services/alias.go:32.2,32.14 1 1
-github.com/muety/wakapi/services/alias.go:29.43,31.3 1 1
-github.com/muety/wakapi/services/alias.go:35.62,37.16 2 1
-github.com/muety/wakapi/services/alias.go:40.2,40.12 1 1
-github.com/muety/wakapi/services/alias.go:37.16,39.3 1 1
-github.com/muety/wakapi/services/alias.go:43.59,44.51 1 1
-github.com/muety/wakapi/services/alias.go:44.51,46.3 1 0
-github.com/muety/wakapi/services/alias.go:49.76,50.32 1 0
-github.com/muety/wakapi/services/alias.go:53.2,53.49 1 0
-github.com/muety/wakapi/services/alias.go:50.32,52.3 1 0
-github.com/muety/wakapi/services/alias.go:53.49,55.3 1 0
-github.com/muety/wakapi/services/alias.go:55.8,57.3 1 0
-github.com/muety/wakapi/services/alias.go:60.102,61.38 1 0
-github.com/muety/wakapi/services/alias.go:64.2,64.39 1 0
-github.com/muety/wakapi/services/alias.go:61.38,63.3 1 0
-github.com/muety/wakapi/services/alias.go:67.113,68.38 1 0
-github.com/muety/wakapi/services/alias.go:71.2,71.39 1 0
-github.com/muety/wakapi/services/alias.go:68.38,70.3 1 0
-github.com/muety/wakapi/services/alias.go:74.108,75.32 1 1
-github.com/muety/wakapi/services/alias.go:79.2,79.49 1 1
-github.com/muety/wakapi/services/alias.go:87.2,87.19 1 1
-github.com/muety/wakapi/services/alias.go:75.32,77.3 1 1
-github.com/muety/wakapi/services/alias.go:79.49,80.47 1 1
-github.com/muety/wakapi/services/alias.go:80.47,81.49 1 1
-github.com/muety/wakapi/services/alias.go:81.49,83.5 1 1
-github.com/muety/wakapi/services/alias.go:90.77,92.16 2 0
-github.com/muety/wakapi/services/alias.go:96.2,100.20 3 0
-github.com/muety/wakapi/services/alias.go:92.16,94.3 1 0
-github.com/muety/wakapi/services/alias.go:103.60,104.24 1 0
-github.com/muety/wakapi/services/alias.go:107.2,110.16 2 0
-github.com/muety/wakapi/services/alias.go:114.2,116.12 2 0
-github.com/muety/wakapi/services/alias.go:104.24,106.3 1 0
-github.com/muety/wakapi/services/alias.go:110.16,112.3 1 0
-github.com/muety/wakapi/services/alias.go:119.69,123.28 3 0
-github.com/muety/wakapi/services/alias.go:131.2,134.16 2 0
-github.com/muety/wakapi/services/alias.go:140.2,140.31 1 0
-github.com/muety/wakapi/services/alias.go:144.2,144.12 1 0
-github.com/muety/wakapi/services/alias.go:123.28,124.21 1 0
-github.com/muety/wakapi/services/alias.go:127.3,128.16 2 0
-github.com/muety/wakapi/services/alias.go:124.21,126.4 1 0
-github.com/muety/wakapi/services/alias.go:134.16,135.29 1 0
-github.com/muety/wakapi/services/alias.go:135.29,137.4 1 0
-github.com/muety/wakapi/services/alias.go:140.31,142.3 1 0
-github.com/muety/wakapi/services/alias.go:147.74,148.14 1 0
-github.com/muety/wakapi/services/alias.go:148.14,149.57 1 0
-github.com/muety/wakapi/services/alias.go:149.57,153.4 3 0
-github.com/muety/wakapi/services/alias.go:154.8,155.57 1 0
-github.com/muety/wakapi/services/alias.go:155.57,157.48 2 0
-github.com/muety/wakapi/services/alias.go:162.4,162.52 1 0
-github.com/muety/wakapi/services/alias.go:157.48,158.26 1 0
-github.com/muety/wakapi/services/alias.go:158.26,160.6 1 0
-github.com/muety/wakapi/services/alias.go:167.116,168.32 1 0
-github.com/muety/wakapi/services/alias.go:171.2,171.49 1 0
-github.com/muety/wakapi/services/alias.go:168.32,170.3 1 0
-github.com/muety/wakapi/services/alias.go:171.49,173.47 2 0
-github.com/muety/wakapi/services/alias.go:178.3,178.30 1 0
-github.com/muety/wakapi/services/alias.go:173.47,174.16 1 0
-github.com/muety/wakapi/services/alias.go:174.16,176.5 1 0
-github.com/muety/wakapi/services/alias.go:179.8,181.3 1 0
-github.com/muety/wakapi/services/diagnostics.go:14.101,19.2 1 0
-github.com/muety/wakapi/services/diagnostics.go:21.101,23.2 1 0
 github.com/muety/wakapi/services/heartbeat.go:26.141,40.33 3 0
 github.com/muety/wakapi/services/heartbeat.go:48.2,48.12 1 0
 github.com/muety/wakapi/services/heartbeat.go:40.33,41.31 1 0
@@ -1148,27 +1138,35 @@ github.com/muety/wakapi/services/language_mapping.go:66.82,67.26 1 0
 github.com/muety/wakapi/services/language_mapping.go:70.2,72.12 3 0
 github.com/muety/wakapi/services/language_mapping.go:67.26,69.3 1 0
 github.com/muety/wakapi/services/language_mapping.go:75.74,78.2 1 0
-github.com/muety/wakapi/services/misc.go:21.126,28.2 1 0
-github.com/muety/wakapi/services/misc.go:40.50,42.48 1 0
-github.com/muety/wakapi/services/misc.go:46.2,48.19 3 0
-github.com/muety/wakapi/services/misc.go:42.48,44.3 1 0
-github.com/muety/wakapi/services/misc.go:51.51,53.16 2 0
-github.com/muety/wakapi/services/misc.go:57.2,60.26 3 0
-github.com/muety/wakapi/services/misc.go:66.2,68.40 2 0
-github.com/muety/wakapi/services/misc.go:73.2,75.33 3 0
-github.com/muety/wakapi/services/misc.go:79.2,84.17 2 0
-github.com/muety/wakapi/services/misc.go:88.2,91.17 1 0
-github.com/muety/wakapi/services/misc.go:95.2,95.12 1 0
-github.com/muety/wakapi/services/misc.go:53.16,55.3 1 0
-github.com/muety/wakapi/services/misc.go:60.26,65.3 1 0
-github.com/muety/wakapi/services/misc.go:68.40,70.3 1 0
-github.com/muety/wakapi/services/misc.go:75.33,78.3 2 0
-github.com/muety/wakapi/services/misc.go:84.17,86.3 1 0
-github.com/muety/wakapi/services/misc.go:91.17,93.3 1 0
-github.com/muety/wakapi/services/misc.go:98.116,99.24 1 0
-github.com/muety/wakapi/services/misc.go:99.24,100.156 1 0
-github.com/muety/wakapi/services/misc.go:100.156,102.4 1 0
-github.com/muety/wakapi/services/misc.go:102.9,107.4 1 0
+github.com/muety/wakapi/services/report.go:30.122,44.33 4 0
+github.com/muety/wakapi/services/report.go:50.2,50.12 1 0
+github.com/muety/wakapi/services/report.go:44.33,45.31 1 0
+github.com/muety/wakapi/services/report.go:45.31,47.4 1 0
+github.com/muety/wakapi/services/report.go:53.38,57.16 3 0
+github.com/muety/wakapi/services/report.go:61.2,62.26 2 0
+github.com/muety/wakapi/services/report.go:57.16,59.3 1 0
+github.com/muety/wakapi/services/report.go:62.26,64.3 1 0
+github.com/muety/wakapi/services/report.go:69.61,74.22 3 0
+github.com/muety/wakapi/services/report.go:81.2,81.65 1 0
+github.com/muety/wakapi/services/report.go:98.2,98.24 1 0
+github.com/muety/wakapi/services/report.go:74.22,78.3 3 0
+github.com/muety/wakapi/services/report.go:81.65,91.47 3 0
+github.com/muety/wakapi/services/report.go:91.47,93.4 1 0
+github.com/muety/wakapi/services/report.go:93.9,95.4 1 0
+github.com/muety/wakapi/services/report.go:101.80,102.22 1 0
+github.com/muety/wakapi/services/report.go:107.2,107.29 1 0
+github.com/muety/wakapi/services/report.go:112.2,116.16 4 0
+github.com/muety/wakapi/services/report.go:121.2,128.65 2 0
+github.com/muety/wakapi/services/report.go:133.2,134.12 2 0
+github.com/muety/wakapi/services/report.go:102.22,105.3 2 0
+github.com/muety/wakapi/services/report.go:107.29,110.3 2 0
+github.com/muety/wakapi/services/report.go:116.16,119.3 2 0
+github.com/muety/wakapi/services/report.go:128.65,131.3 2 0
+github.com/muety/wakapi/services/report.go:137.63,138.41 1 0
+github.com/muety/wakapi/services/report.go:145.2,145.12 1 0
+github.com/muety/wakapi/services/report.go:138.41,139.30 1 0
+github.com/muety/wakapi/services/report.go:139.30,140.16 1 0
+github.com/muety/wakapi/services/report.go:140.16,142.5 1 0
 github.com/muety/wakapi/services/user.go:24.99,34.33 3 0
 github.com/muety/wakapi/services/user.go:55.2,55.12 1 0
 github.com/muety/wakapi/services/user.go:34.33,35.31 1 0
@@ -1220,3 +1218,5 @@ github.com/muety/wakapi/services/user.go:184.85,186.2 1 0
 github.com/muety/wakapi/services/user.go:188.57,195.2 4 0
 github.com/muety/wakapi/services/user.go:197.38,199.2 1 0
 github.com/muety/wakapi/services/user.go:201.57,206.2 1 0
+github.com/muety/wakapi/services/diagnostics.go:14.101,19.2 1 0
+github.com/muety/wakapi/services/diagnostics.go:21.101,23.2 1 0
diff --git a/routes/compat/wakatime/v1/heartbeat.go b/routes/compat/wakatime/v1/heartbeat.go
index eb1dd62..c21f797 100644
--- a/routes/compat/wakatime/v1/heartbeat.go
+++ b/routes/compat/wakatime/v1/heartbeat.go
@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"github.com/duke-git/lancet/v2/datetime"
 	"net/http"
 	"time"
 
@@ -65,7 +66,7 @@ func (h *HeartbeatHandler) Get(w http.ResponseWriter, r *http.Request) {
 	}
 
 	timezone := user.TZ()
-	rangeFrom, rangeTo := utils.StartOfDay(date.In(timezone)), utils.EndOfDay(date.In(timezone))
+	rangeFrom, rangeTo := datetime.BeginOfDay(date.In(timezone)), datetime.EndOfDay(date.In(timezone))
 
 	heartbeats, err := h.heartbeatSrvc.GetAllWithin(rangeFrom, rangeTo, user)
 	if err != nil {
diff --git a/routes/compat/wakatime/v1/summaries.go b/routes/compat/wakatime/v1/summaries.go
index 19ba5cb..54ac005 100644
--- a/routes/compat/wakatime/v1/summaries.go
+++ b/routes/compat/wakatime/v1/summaries.go
@@ -2,6 +2,7 @@ package v1
 
 import (
 	"errors"
+	"github.com/duke-git/lancet/v2/datetime"
 	"net/http"
 	"strings"
 	"time"
@@ -120,7 +121,7 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
 	// i.e. for wakatime, an interval 2021-04-29 - 2021-04-29 is actually 2021-04-29 - 2021-04-30,
 	// while for wakapi it would be empty
 	// see https://github.com/muety/wakapi/issues/192
-	end = utils.EndOfDay(end).Add(-1 * time.Second)
+	end = datetime.EndOfDay(end)
 
 	overallParams := &models.SummaryParams{
 		From: start,
diff --git a/routes/routes.go b/routes/routes.go
index 3b50a2a..53ea260 100644
--- a/routes/routes.go
+++ b/routes/routes.go
@@ -2,6 +2,7 @@ package routes
 
 import (
 	"fmt"
+	"github.com/duke-git/lancet/v2/datetime"
 	"github.com/muety/wakapi/views"
 	"html/template"
 	"net/http"
@@ -28,7 +29,7 @@ func DefaultTemplateFuncs() template.FuncMap {
 		"simpledate":     utils.FormatDate,
 		"simpledatetime": utils.FormatDateTime,
 		"duration":       utils.FmtWakatimeDuration,
-		"floordate":      utils.FloorDate,
+		"floordate":      datetime.BeginOfDay,
 		"ceildate":       utils.CeilDate,
 		"title":          strings.Title,
 		"join":           strings.Join,
diff --git a/services/imports/wakatime.go b/services/imports/wakatime.go
index 0fdbabb..d210161 100644
--- a/services/imports/wakatime.go
+++ b/services/imports/wakatime.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/duke-git/lancet/v2/datetime"
 	"net/http"
 	"time"
 
@@ -13,7 +14,6 @@ import (
 	"github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	wakatime "github.com/muety/wakapi/models/compat/wakatime/v1"
-	"github.com/muety/wakapi/utils"
 	"go.uber.org/atomic"
 	"golang.org/x/sync/semaphore"
 )
@@ -295,8 +295,8 @@ func mapHeartbeat(
 func generateDays(from, to time.Time) []time.Time {
 	days := make([]time.Time, 0)
 
-	from = utils.StartOfDay(from)
-	to = utils.StartOfDay(to.AddDate(0, 0, 1))
+	from = datetime.BeginOfDay(from)
+	to = datetime.BeginOfDay(to.AddDate(0, 0, 1))
 
 	for d := from; d.Before(to); d = d.AddDate(0, 0, 1) {
 		days = append(days, d)
diff --git a/services/summary.go b/services/summary.go
index 21dc2c9..1e22269 100644
--- a/services/summary.go
+++ b/services/summary.go
@@ -3,6 +3,7 @@ package services
 import (
 	"errors"
 	"fmt"
+	"github.com/duke-git/lancet/v2/datetime"
 	"github.com/emvi/logbuch"
 	"github.com/leandro-lugaresi/hub"
 	"github.com/muety/wakapi/config"
@@ -113,7 +114,7 @@ func (srv *SummaryService) Retrieve(from, to time.Time, user *models.User, filte
 	}
 
 	// Generate missing slots (especially before and after existing summaries) from durations (formerly raw heartbeats)
-	missingIntervals := srv.getMissingIntervals(from, to, summaries)
+	missingIntervals := srv.getMissingIntervals(from, to, summaries, false)
 	for _, interval := range missingIntervals {
 		if s, err := srv.Summarize(interval.Start, interval.End, user, filters); err == nil {
 			summaries = append(summaries, s)
@@ -368,7 +369,7 @@ func (srv *SummaryService) mergeSummaryItems(existing []*models.SummaryItem, new
 	return itemList
 }
 
-func (srv *SummaryService) getMissingIntervals(from, to time.Time, summaries []*models.Summary) []*models.Interval {
+func (srv *SummaryService) getMissingIntervals(from, to time.Time, summaries []*models.Summary, precise bool) []*models.Interval {
 	if len(summaries) == 0 {
 		return []*models.Interval{{from, to}}
 	}
@@ -377,37 +378,43 @@ func (srv *SummaryService) getMissingIntervals(from, to time.Time, summaries []*
 
 	// Pre
 	if from.Before(summaries[0].FromTime.T()) {
-		intervals = append(intervals, &models.Interval{from, summaries[0].FromTime.T()})
+		intervals = append(intervals, &models.Interval{Start: from, End: summaries[0].FromTime.T()})
 	}
 
 	// Between
 	for i := 0; i < len(summaries)-1; i++ {
 		t1, t2 := summaries[i].ToTime.T(), summaries[i+1].FromTime.T()
-		if t1.Equal(t2) {
+		if t1.Equal(t2) || t1.Equal(to) || t1.After(to) {
 			continue
 		}
 
+		td1 := t1
+		td2 := t2
+
 		// round to end of day / start of day, assuming that summaries are always generated on a per-day basis
 		// we assume that, if summary for any time range within a day is present, no further heartbeats exist on that day before 'from' and after 'to' time of that summary
 		// this requires that a summary exists for every single day in a year and none is skipped, which shouldn't ever happen
-		td1 := time.Date(t1.Year(), t1.Month(), t1.Day()+1, 0, 0, 0, 0, t1.Location())
-		td2 := time.Date(t2.Year(), t2.Month(), t2.Day(), 0, 0, 0, 0, t2.Location())
+		// non-precise mode is mainly for speed when fetching summaries over large intervals and trades speed for summary accuracy / comprehensiveness
+		if !precise {
+			td1 = datetime.BeginOfDay(t1).AddDate(0, 0, 1)
+			td2 = datetime.BeginOfDay(t2)
 
-		// we always want to jump to beginning of next day
-		// however, if left summary ends already at midnight, we would instead jump to beginning of second-next day -> go back again
-		if td1.Sub(t1) == 24*time.Hour {
-			td1 = td1.Add(-1 * time.Hour)
+			// we always want to jump to beginning of next day
+			// however, if left summary ends already at midnight, we would instead jump to beginning of second-next day -> go back again
+			if td1.Sub(t1) == 24*time.Hour {
+				td1 = td1.Add(-1 * time.Hour)
+			}
 		}
 
 		// one or more day missing in between?
 		if td1.Before(td2) {
-			intervals = append(intervals, &models.Interval{summaries[i].ToTime.T(), summaries[i+1].FromTime.T()})
+			intervals = append(intervals, &models.Interval{Start: summaries[i].ToTime.T(), End: summaries[i+1].FromTime.T()})
 		}
 	}
 
 	// Post
 	if to.After(summaries[len(summaries)-1].ToTime.T()) {
-		intervals = append(intervals, &models.Interval{summaries[len(summaries)-1].ToTime.T(), to})
+		intervals = append(intervals, &models.Interval{Start: summaries[len(summaries)-1].ToTime.T(), End: to})
 	}
 
 	return intervals
diff --git a/services/summary_test.go b/services/summary_test.go
index 74131d4..0c9f61b 100644
--- a/services/summary_test.go
+++ b/services/summary_test.go
@@ -485,6 +485,45 @@ func (suite *SummaryServiceTestSuite) TestSummaryService_Filters() {
 	assert.Contains(suite.T(), effectiveFilters.Label, TestProjectLabel3)
 }
 
+func (suite *SummaryServiceTestSuite) TestSummaryService_getMissingIntervals() {
+	sut := NewSummaryService(suite.SummaryRepository, suite.DurationService, suite.AliasService, suite.ProjectLabelService)
+
+	from1, _ := time.Parse(time.RFC822, "25 Mar 22 11:00 UTC")
+	to1, _ := time.Parse(time.RFC822, "25 Mar 22 13:00 UTC")
+	from2, _ := time.Parse(time.RFC822, "25 Mar 22 15:00 UTC")
+	to2, _ := time.Parse(time.RFC822, "26 Mar 22 00:00 UTC")
+
+	summaries := []*models.Summary{
+		{FromTime: models.CustomTime(from1), ToTime: models.CustomTime(to1)},
+		{FromTime: models.CustomTime(from2), ToTime: models.CustomTime(to2)},
+	}
+
+	r1 := sut.getMissingIntervals(from1, to1, summaries, true)
+	assert.Empty(suite.T(), r1)
+
+	r2 := sut.getMissingIntervals(from1, from1, summaries, true)
+	assert.Empty(suite.T(), r2)
+
+	// non-precise mode will not return intra-day intervals
+	// we might want to change this ...
+	r3 := sut.getMissingIntervals(from1, to2, summaries, false)
+	assert.Len(suite.T(), r3, 0)
+
+	r4 := sut.getMissingIntervals(from1, to2, summaries, true)
+	assert.Len(suite.T(), r4, 1)
+	assert.Equal(suite.T(), to1, r4[0].Start)
+	assert.Equal(suite.T(), from2, r4[0].End)
+
+	r5 := sut.getMissingIntervals(from1.Add(-time.Hour), to2.Add(time.Hour), summaries, true)
+	assert.Len(suite.T(), r5, 3)
+	assert.Equal(suite.T(), from1.Add(-time.Hour), r5[0].Start)
+	assert.Equal(suite.T(), from1, r5[0].End)
+	assert.Equal(suite.T(), to1, r5[1].Start)
+	assert.Equal(suite.T(), from2, r5[1].End)
+	assert.Equal(suite.T(), to2, r5[2].Start)
+	assert.Equal(suite.T(), to2.Add(time.Hour), r5[2].End)
+}
+
 func filterDurations(from, to time.Time, durations models.Durations) models.Durations {
 	filtered := make([]*models.Duration, 0, len(durations))
 	for _, d := range durations {
diff --git a/services/user.go b/services/user.go
index 98ce8f6..3e1483b 100644
--- a/services/user.go
+++ b/services/user.go
@@ -2,6 +2,7 @@ package services
 
 import (
 	"fmt"
+	"github.com/duke-git/lancet/v2/datetime"
 	"github.com/emvi/logbuch"
 	"github.com/leandro-lugaresi/hub"
 	"github.com/muety/wakapi/config"
@@ -100,9 +101,9 @@ func (srv *UserService) GetAllByReports(reportsEnabled bool) ([]*models.User, er
 }
 
 func (srv *UserService) GetActive(exact bool) ([]*models.User, error) {
-	minDate := time.Now().Add(-24 * time.Hour * time.Duration(srv.config.App.InactiveDays))
+	minDate := time.Now().AddDate(0, 0, -1*srv.config.App.InactiveDays)
 	if !exact {
-		minDate = utils.FloorDateHour(minDate)
+		minDate = datetime.BeginOfHour(minDate)
 	}
 
 	cacheKey := fmt.Sprintf("%s--active", minDate.String())
diff --git a/testing/wakapi_api_tests.postman_collection.json b/testing/wakapi_api_tests.postman_collection.json
index c5fa8ce..73e807b 100644
--- a/testing/wakapi_api_tests.postman_collection.json
+++ b/testing/wakapi_api_tests.postman_collection.json
@@ -1033,7 +1033,7 @@
 									"    pm.expect(jsonData.timezone).to.eql(pm.collectionVariables.get('TZ'));",
 									"    var date = new Date(\"2022-01-01T00:00:00+0100\")",
 									"    pm.expect(new Date(jsonData.start)).to.eql(date);",
-									"    pm.expect(new Date(jsonData.end)).to.eql(new Date(date.getTime() + 3600 * 1000 * 24));",
+									"    pm.expect(new Date(jsonData.end)).to.eql(new Date(date.getTime() + 3600 * 1000 * 24 - 1000));",
 									"    pm.expect(jsonData.data.length).to.eql(2);",
 									"});"
 								],
diff --git a/utils/date.go b/utils/date.go
index de5176d..4a0a64e 100644
--- a/utils/date.go
+++ b/utils/date.go
@@ -2,99 +2,41 @@ package utils
 
 import (
 	"fmt"
+	"github.com/duke-git/lancet/v2/datetime"
 	"time"
 )
 
-// TODO: replace these functions by github.com/duke-git/lancet/v2/datetime
-// needs additional thoughts, though, as for "EndOfX" functions, we currently return the discrete next day,
-// while the above lib returns the very last nanosecond of the current day, i.e.
-// 2022-02-15 23:59:59.999 +0800 CST vs. 2022-02-16 00:00:00.000 +0800 CST
-// -> need to revisit comparison logic, etc.
-
-func StartOfDay(date time.Time) time.Time {
-	return FloorDate(date)
+func BeginOfToday(tz *time.Location) time.Time {
+	return datetime.BeginOfDay(time.Now().In(tz))
 }
 
-func StartOfToday(tz *time.Location) time.Time {
-	return StartOfDay(FloorDate(time.Now().In(tz)))
+func BeginOfThisWeek(tz *time.Location) time.Time {
+	return datetime.BeginOfWeek(time.Now().In(tz))
 }
 
-func EndOfDay(date time.Time) time.Time {
-	floored := FloorDate(date)
-	if floored == date {
-		date = date.Add(1 * time.Second)
-	}
-	return CeilDate(date)
+func BeginOfThisMonth(tz *time.Location) time.Time {
+	return datetime.BeginOfMonth(time.Now().In(tz))
 }
 
-func EndOfToday(tz *time.Location) time.Time {
-	return EndOfDay(time.Now().In(tz))
-}
-
-func StartOfThisWeek(tz *time.Location) time.Time {
-	return StartOfWeek(time.Now().In(tz))
-}
-
-func StartOfWeek(date time.Time) time.Time {
-	year, week := date.ISOWeek()
-	return firstDayOfISOWeek(year, week, date.Location())
-}
-
-func StartOfThisMonth(tz *time.Location) time.Time {
-	return StartOfMonth(time.Now().In(tz))
-}
-
-func StartOfMonth(date time.Time) time.Time {
-	return time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
-}
-
-func StartOfThisYear(tz *time.Location) time.Time {
-	return StartOfYear(time.Now().In(tz))
-}
-
-func StartOfYear(date time.Time) time.Time {
-	return time.Date(date.Year(), time.January, 1, 0, 0, 0, 0, date.Location())
-}
-
-// FloorDate rounds date down to the start of the day and keeps the time zone
-func FloorDate(date time.Time) time.Time {
-	return time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, date.Location())
-}
-
-// FloorDateHour rounds date down to the start of the current hour and keeps the time zone
-func FloorDateHour(date time.Time) time.Time {
-	return time.Date(date.Year(), date.Month(), date.Day(), date.Hour(), 0, 0, 0, date.Location())
+func BeginOfThisYear(tz *time.Location) time.Time {
+	return datetime.BeginOfYear(time.Now().In(tz))
 }
 
 // CeilDate rounds date up to the start of next day if date is not already a start (00:00:00)
 func CeilDate(date time.Time) time.Time {
-	floored := FloorDate(date)
+	floored := datetime.BeginOfDay(date)
 	if floored == date {
 		return floored
 	}
 	return floored.AddDate(0, 0, 1)
 }
 
-// SetLocation resets the time zone information of a date without converting it, i.e. 19:00 UTC will result in 19:00 CET, for instance
-func SetLocation(date time.Time, tz *time.Location) time.Time {
-	return time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, tz)
-}
-
-// WithOffset adds the time zone difference between Local and tz to a date, i.e. 19:00 UTC will result in 21:00 CET (or 22:00 CEST), for instance
-func WithOffset(date time.Time, tz *time.Location) time.Time {
-	now := time.Now()
-	_, localOffset := now.Zone()
-	_, targetOffset := now.In(tz).Zone()
-	dateTz := date.Add(time.Duration((targetOffset - localOffset) * int(time.Second)))
-	return time.Date(dateTz.Year(), dateTz.Month(), dateTz.Day(), dateTz.Hour(), dateTz.Minute(), dateTz.Second(), dateTz.Nanosecond(), dateTz.Location()).In(tz)
-}
-
 // SplitRangeByDays creates a slice of intervals between from and to, each of which is at max of 24 hours length and has its split at midnight
 func SplitRangeByDays(from time.Time, to time.Time) [][]time.Time {
 	intervals := make([][]time.Time, 0)
 
 	for t1 := from; t1.Before(to); {
-		t2 := StartOfDay(t1).AddDate(0, 0, 1)
+		t2 := datetime.BeginOfDay(t1).AddDate(0, 0, 1)
 		if t2.After(to) {
 			t2 = to
 		}
@@ -118,22 +60,3 @@ func LocalTZOffset() time.Duration {
 	_, offset := time.Now().Zone()
 	return time.Duration(offset * int(time.Second))
 }
-
-// https://stackoverflow.com/a/18632496
-func firstDayOfISOWeek(year int, week int, timezone *time.Location) time.Time {
-	date := time.Date(year, 0, 0, 0, 0, 0, 0, timezone)
-	isoYear, isoWeek := date.ISOWeek()
-	for date.Weekday() != time.Monday { // iterate back to Monday
-		date = date.AddDate(0, 0, -1)
-		isoYear, isoWeek = date.ISOWeek()
-	}
-	for isoYear < year { // iterate forward to the first day of the first week
-		date = date.AddDate(0, 0, 1)
-		isoYear, isoWeek = date.ISOWeek()
-	}
-	for isoWeek < week { // iterate forward to the first day of the given week
-		date = date.AddDate(0, 0, 1)
-		isoYear, isoWeek = date.ISOWeek()
-	}
-	return date
-}
diff --git a/utils/date_test.go b/utils/date_test.go
index 4952528..02d85db 100644
--- a/utils/date_test.go
+++ b/utils/date_test.go
@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"github.com/duke-git/lancet/v2/datetime"
 	"github.com/muety/wakapi/config"
 	"github.com/stretchr/testify/assert"
 	"testing"
@@ -21,100 +22,11 @@ func init() {
 	tzPst, _ = time.LoadLocation("America/Los_Angeles")
 }
 
-func TestDate_Ceil(t *testing.T) {
-	tests := []struct {
-		in  string
-		out string
-	}{
-		{
-			"02 Jan 06 15:04 MST",
-			"03 Jan 06 00:00 MST",
-		},
-		{
-			"03 Jan 06 00:00 MST",
-			"03 Jan 06 00:00 MST",
-		},
-	}
-
-	for _, test := range tests {
-		inDate, _ := time.Parse(time.RFC822, test.in)
-		outDate, _ := time.Parse(time.RFC822, test.out)
-		out := CeilDate(inDate)
-		assert.Equal(t, outDate, out)
-	}
-}
-
-func TestDate_StartOfDay(t *testing.T) {
-	d1, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzLocal)
-	d2, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzUtc)
-	d3, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzPst)
-	d4, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzCet)
-
-	t1, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 00:00:00", tzLocal)
-	t2, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 00:00:00", tzUtc)
-	t3, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 00:00:00", tzPst)
-	t4, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 00:00:00", tzCet)
-
-	assert.Equal(t, t1, StartOfDay(d1))
-	assert.Equal(t, t2, StartOfDay(d2))
-	assert.Equal(t, t3, StartOfDay(d3))
-	assert.Equal(t, t4, StartOfDay(d4))
-
-	assert.Equal(t, tzLocal, StartOfDay(d1).Location())
-	assert.Equal(t, tzUtc, StartOfDay(d2).Location())
-	assert.Equal(t, tzPst, StartOfDay(d3).Location())
-	assert.Equal(t, tzCet, StartOfDay(d4).Location())
-}
-
-func TestDate_EndOfDay(t *testing.T) {
-	d1, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzLocal)
-	d2, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzUtc)
-	d3, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzPst)
-	d4, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzCet)
-
-	t1, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-26 00:00:00", tzLocal)
-	t2, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-26 00:00:00", tzUtc)
-	t3, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-26 00:00:00", tzPst)
-	t4, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-26 00:00:00", tzCet)
-
-	assert.Equal(t, t1, EndOfDay(d1))
-	assert.Equal(t, t2, EndOfDay(d2))
-	assert.Equal(t, t3, EndOfDay(d3))
-	assert.Equal(t, t4, EndOfDay(d4))
-
-	assert.Equal(t, tzLocal, EndOfDay(d1).Location())
-	assert.Equal(t, tzUtc, EndOfDay(d2).Location())
-	assert.Equal(t, tzPst, EndOfDay(d3).Location())
-	assert.Equal(t, tzCet, EndOfDay(d4).Location())
-}
-
-func TestDate_StartOfWeek(t *testing.T) {
-	d1, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzLocal)
-	d2, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzUtc)
-	d3, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzPst)
-	d4, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-25 20:25:00", tzCet)
-
-	t1, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-19 00:00:00", tzLocal)
-	t2, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-19 00:00:00", tzUtc)
-	t3, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-19 00:00:00", tzPst)
-	t4, _ := time.ParseInLocation(config.SimpleDateTimeFormat, "2021-04-19 00:00:00", tzCet)
-
-	assert.Equal(t, t1, StartOfWeek(d1))
-	assert.Equal(t, t2, StartOfWeek(d2))
-	assert.Equal(t, t3, StartOfWeek(d3))
-	assert.Equal(t, t4, StartOfWeek(d4))
-
-	assert.Equal(t, tzLocal, StartOfWeek(d1).Location())
-	assert.Equal(t, tzUtc, StartOfWeek(d2).Location())
-	assert.Equal(t, tzPst, StartOfWeek(d3).Location())
-	assert.Equal(t, tzCet, StartOfWeek(d4).Location())
-}
-
 func TestDate_SplitRangeByDays(t *testing.T) {
 	df1, _ := time.Parse(config.SimpleDateTimeFormat, "2021-04-25 20:25:00")
 	dt1, _ := time.Parse(config.SimpleDateTimeFormat, "2021-04-28 06:45:00")
 	df2 := df1
-	dt2 := CeilDate(df1)
+	dt2 := datetime.EndOfDay(df1)
 	df3 := df1
 	dt3 := df1.Add(10 * time.Second)
 	df4 := df1
diff --git a/utils/summary.go b/utils/summary.go
index 11f8c3a..a4f9823 100644
--- a/utils/summary.go
+++ b/utils/summary.go
@@ -35,27 +35,27 @@ func ResolveIntervalTZ(interval *models.IntervalKey, tz *time.Location) (err err
 
 	switch interval {
 	case models.IntervalToday:
-		from = StartOfToday(tz)
+		from = BeginOfToday(tz)
 	case models.IntervalYesterday:
-		from = StartOfToday(tz).Add(-24 * time.Hour)
-		to = StartOfToday(tz)
+		from = BeginOfToday(tz).Add(-24 * time.Hour)
+		to = BeginOfToday(tz)
 	case models.IntervalThisWeek:
-		from = StartOfThisWeek(tz)
+		from = BeginOfThisWeek(tz)
 	case models.IntervalLastWeek:
-		from = StartOfThisWeek(tz).AddDate(0, 0, -7)
-		to = StartOfThisWeek(tz)
+		from = BeginOfThisWeek(tz).AddDate(0, 0, -7)
+		to = BeginOfThisWeek(tz)
 	case models.IntervalThisMonth:
-		from = StartOfThisMonth(tz)
+		from = BeginOfThisMonth(tz)
 	case models.IntervalLastMonth:
-		from = StartOfThisMonth(tz).AddDate(0, -1, 0)
-		to = StartOfThisMonth(tz)
+		from = BeginOfThisMonth(tz).AddDate(0, -1, 0)
+		to = BeginOfThisMonth(tz)
 	case models.IntervalThisYear:
-		from = StartOfThisYear(tz)
+		from = BeginOfThisYear(tz)
 	case models.IntervalPast7Days:
 		from = now.AddDate(0, 0, -7)
 	case models.IntervalPast7DaysYesterday:
-		from = StartOfToday(tz).AddDate(0, 0, -1).AddDate(0, 0, -7)
-		to = StartOfToday(tz).AddDate(0, 0, -1)
+		from = BeginOfToday(tz).AddDate(0, 0, -1).AddDate(0, 0, -7)
+		to = BeginOfToday(tz).AddDate(0, 0, -1)
 	case models.IntervalPast14Days:
 		from = now.AddDate(0, 0, -14)
 	case models.IntervalPast30Days: