diff --git a/.idea/runConfigurations/Cortex_tests.xml b/.idea/runConfigurations/Cortex_tests.xml
deleted file mode 100644
index 806a16db24..0000000000
--- a/.idea/runConfigurations/Cortex_tests.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Cortex tests" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <extension name="coverage" sample_coverage="false">
-      <pattern>
-        <option name="PATTERN" value="org.thp.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="All in package" />
-    <option name="classBuf">
-      <list>
-        <option value="org.thp.thehive.connector.cortex.controllers.v0.JobCtrlTest" />
-        <option value="org.thp.thehive.connector.cortex.controllers.v0.AnalyzerCtrlTest" />
-        <option value="org.thp.thehive.connector.cortex.controllers.v0.AnalyzerTemplateCtrlTest" />
-        <option value="org.thp.thehive.connector.cortex.controllers.v0.AnalyzerCtrlTest" />
-        <option value="org.thp.thehive.connector.cortex.controllers.v0.JobCtrlTest" />
-        <option value="org.thp.thehive.connector.cortex.controllers.v0.AnalyzerTemplateCtrlTest" />
-        <option value="org.thp.thehive.connector.cortex.services.JobSrvTest" />
-        <option value="org.thp.thehive.connector.cortex.services.ActionSrvTest" />
-        <option value="org.thp.thehive.connector.cortex.services.AnalyzerSrvTest" />
-        <option value="org.thp.thehive.connector.cortex.services.EntityHelperTest" />
-        <option value="org.thp.thehive.connector.cortex.services.ResponderSrvTest" />
-        <option value="org.thp.thehive.connector.cortex.services.ServiceHelperTest" />
-        <option value="org.thp.thehive.connector.cortex.services.ActionSrvTest" />
-        <option value="org.thp.thehive.connector.cortex.services.EntityHelperTest" />
-        <option value="org.thp.thehive.connector.cortex.services.ServiceHelperTest" />
-        <option value="org.thp.thehive.connector.cortex.services.JobSrvTest" />
-        <option value="org.thp.thehive.connector.cortex.services.AnalyzerSrvTest" />
-        <option value="org.thp.thehive.connector.cortex.services.ResponderSrvTest" />
-      </list>
-    </option>
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="" />
-    <option name="jrePath" />
-    <option name="searchTest" value="In single module" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testPackagePath" value="" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Misp_tests.xml b/.idea/runConfigurations/Misp_tests.xml
deleted file mode 100644
index d068ce0111..0000000000
--- a/.idea/runConfigurations/Misp_tests.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Misp tests" type="Specs2RunConfiguration" factoryName="Specs2" folderName="misp" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-misp" />
-    <extension name="coverage" sample_coverage="false">
-      <pattern>
-        <option name="PATTERN" value="org.thp.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="All in package" />
-    <option name="classBuf">
-      <list>
-        <option value="org.thp.thehive.connector.misp.services.MispImportSrvTest" />
-        <option value="org.thp.thehive.connector.misp.services.MispImportSrvTest" />
-      </list>
-    </option>
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="" />
-    <option name="jrePath" />
-    <option name="searchTest" value="In single module" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testPackagePath" value="" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Scalligraph_tests.xml b/.idea/runConfigurations/Scalligraph_tests.xml
deleted file mode 100644
index 30ca06a8da..0000000000
--- a/.idea/runConfigurations/Scalligraph_tests.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Scalligraph tests" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <extension name="coverage" sample_coverage="false">
-      <pattern>
-        <option name="PATTERN" value="org.thp.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="All in package" />
-    <option name="classBuf">
-      <list>
-        <option value="org.thp.scalligraph.FPathTest" />
-        <option value="org.thp.scalligraph.RetryTest" />
-        <option value="org.thp.scalligraph.ScalligraphApplicationTest" />
-        <option value="org.thp.scalligraph.ScalligraphApplicationTest" />
-        <option value="org.thp.scalligraph.FPathTest" />
-        <option value="org.thp.scalligraph.RetryTest" />
-        <option value="org.thp.scalligraph.controllers.FieldsTest" />
-        <option value="org.thp.scalligraph.controllers.ControllerTest" />
-        <option value="org.thp.scalligraph.controllers.FieldsParserMacroTest" />
-        <option value="org.thp.scalligraph.controllers.UpdateFieldsParserMacroTest" />
-        <option value="org.thp.scalligraph.controllers.FieldsTest" />
-        <option value="org.thp.scalligraph.controllers.ControllerTest" />
-        <option value="org.thp.scalligraph.controllers.UpdateFieldsParserMacroTest" />
-        <option value="org.thp.scalligraph.controllers.FieldsParserMacroTest" />
-        <option value="org.thp.scalligraph.models.IndexTest" />
-        <option value="org.thp.scalligraph.models.QueryTest" />
-        <option value="org.thp.scalligraph.models.ModernTest" />
-        <option value="org.thp.scalligraph.models.CallbackTest" />
-        <option value="org.thp.scalligraph.models.CardinalityTest" />
-        <option value="org.thp.scalligraph.models.SimpleEntityTest" />
-        <option value="org.thp.scalligraph.models.SimpleEntityTest" />
-        <option value="org.thp.scalligraph.models.IndexTest" />
-        <option value="org.thp.scalligraph.models.ModernTest" />
-        <option value="org.thp.scalligraph.models.CardinalityTest" />
-        <option value="org.thp.scalligraph.models.CallbackTest" />
-        <option value="org.thp.scalligraph.models.QueryTest" />
-        <option value="org.thp.scalligraph.services.StorageSrvTest" />
-        <option value="org.thp.scalligraph.services.StorageSrvTest" />
-      </list>
-    </option>
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="" />
-    <option name="jrePath" />
-    <option name="searchTest" value="In single module" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testPackagePath" value="" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TheHive.xml b/.idea/runConfigurations/TheHive.xml
deleted file mode 100644
index d9b3e83524..0000000000
--- a/.idea/runConfigurations/TheHive.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TheHive" type="Play2FrameworkRunConfigurations" factoryName="Play 2 App" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="enableSbtGlobalPlugins" value="false" />
-    <option name="play2EnvVariables">
-      <map>
-        <entry key="-Dlogger.file" value="conf/logback.xml" />
-      </map>
-    </option>
-    <option name="play2IsNonDefaultInstallDirUsed" value="false" />
-    <option name="play2JpdaPort" value="9999" />
-    <option name="play2JvmOptions">
-      <array>
-        <option value="-Xms512M" />
-        <option value="-Xmx1024M" />
-        <option value="-Xss1M" />
-        <option value="-XX:+CMSClassUnloadingEnabled" />
-        <option value="-XX:MaxPermSize=256M" />
-      </array>
-    </option>
-    <option name="play2NeedOpenInBrowser" value="false" />
-    <option name="play2NonDefaultInstallDir" value="" />
-    <option name="play2OpenUrl" value="http://localhost:9000" />
-    <option name="play2isAutoReloadEnabled" value="false" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TheHive_tests.xml b/.idea/runConfigurations/TheHive_tests.xml
deleted file mode 100644
index c5796cdc2b..0000000000
--- a/.idea/runConfigurations/TheHive_tests.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TheHive tests" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <extension name="coverage" sample_coverage="false">
-      <pattern>
-        <option name="PATTERN" value="org.thp.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="All in package" />
-    <option name="classBuf">
-      <list>
-        <option value="org.thp.thehive.controllers.v1.CaseCtrlTest" />
-        <option value="org.thp.thehive.controllers.v1.UserCtrlTest" />
-        <option value="org.thp.thehive.controllers.v1.AlertCtrlTest" />
-        <option value="org.thp.thehive.controllers.v1.OrganisationCtrlTest" />
-        <option value="org.thp.thehive.controllers.v1.CaseCtrlTest" />
-        <option value="org.thp.thehive.controllers.v1.OrganisationCtrlTest" />
-        <option value="org.thp.thehive.controllers.v1.UserCtrlTest" />
-        <option value="org.thp.thehive.controllers.v1.AlertCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.QueryTest" />
-        <option value="org.thp.thehive.controllers.v0.LogCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.TagCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.CaseCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.PageCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.TaskCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.UserCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AlertCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AuditCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ShareCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ConfigCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.StatusCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.StreamCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ProfileCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.DescribeCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.DashboardCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AttachmentCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ObservableCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.CustomFieldCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.CaseTemplateCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.OrganisationCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AuthenticationCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ShareCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.StreamCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.CaseCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.StatusCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.QueryTest" />
-        <option value="org.thp.thehive.controllers.v0.LogCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.DashboardCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.CaseTemplateCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.OrganisationCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AttachmentCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ProfileCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.TaskCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.TagCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.CustomFieldCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.DescribeCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ObservableCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.UserCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AuthenticationCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AlertCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.PageCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.AuditCtrlTest" />
-        <option value="org.thp.thehive.controllers.v0.ConfigCtrlTest" />
-        <option value="org.thp.thehive.services.CaseSrvTest" />
-        <option value="org.thp.thehive.services.DataSrvTest" />
-        <option value="org.thp.thehive.services.UserSrvTest" />
-        <option value="org.thp.thehive.services.AlertSrvTest" />
-        <option value="org.thp.thehive.services.AuditSrvTest" />
-        <option value="org.thp.thehive.services.ConfigSrvTest" />
-        <option value="org.thp.thehive.services.DashboardSrvTest" />
-        <option value="org.thp.thehive.services.AttachmentSrvTest" />
-        <option value="org.thp.thehive.services.CustomFieldSrvTest" />
-        <option value="org.thp.thehive.services.CaseTemplateSrvTest" />
-        <option value="org.thp.thehive.services.ImpactStatusSrvTest" />
-        <option value="org.thp.thehive.services.OrganisationSrvTest" />
-        <option value="org.thp.thehive.services.LocalPasswordAuthSrvTest" />
-        <option value="org.thp.thehive.services.DashboardSrvTest" />
-        <option value="org.thp.thehive.services.CaseSrvTest" />
-        <option value="org.thp.thehive.services.AlertSrvTest" />
-        <option value="org.thp.thehive.services.OrganisationSrvTest" />
-        <option value="org.thp.thehive.services.CaseTemplateSrvTest" />
-        <option value="org.thp.thehive.services.LocalPasswordAuthSrvTest" />
-        <option value="org.thp.thehive.services.UserSrvTest" />
-        <option value="org.thp.thehive.services.CustomFieldSrvTest" />
-        <option value="org.thp.thehive.services.AttachmentSrvTest" />
-        <option value="org.thp.thehive.services.ImpactStatusSrvTest" />
-        <option value="org.thp.thehive.services.AuditSrvTest" />
-        <option value="org.thp.thehive.services.ConfigSrvTest" />
-        <option value="org.thp.thehive.services.DataSrvTest" />
-        <option value="org.thp.thehive.services.notification.triggers.AlertCreatedTest" />
-        <option value="org.thp.thehive.services.notification.triggers.TaskAssignedTest" />
-        <option value="org.thp.thehive.services.notification.triggers.AlertCreatedTest" />
-        <option value="org.thp.thehive.services.notification.triggers.TaskAssignedTest" />
-        <option value="org.thp.thehive.services.notification.notifiers.NotificationTemplateTest" />
-        <option value="org.thp.thehive.services.notification.notifiers.NotificationTemplateTest" />
-      </list>
-    </option>
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="" />
-    <option name="jrePath" />
-    <option name="searchTest" value="In single module" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testPackagePath" value="" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_ActionSrv.xml b/.idea/runConfigurations/cortex_ActionSrv.xml
deleted file mode 100644
index 6c6c97726e..0000000000
--- a/.idea/runConfigurations/cortex_ActionSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/ActionSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.services.ActionSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_AnalyzerSrv.xml b/.idea/runConfigurations/cortex_AnalyzerSrv.xml
deleted file mode 100644
index 07f9b8036c..0000000000
--- a/.idea/runConfigurations/cortex_AnalyzerSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/AnalyzerSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.services.AnalyzerSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_Client.xml b/.idea/runConfigurations/cortex_Client.xml
deleted file mode 100644
index b4034f8316..0000000000
--- a/.idea/runConfigurations/cortex_Client.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/Client" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="cortex-client" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.cortex.client.CortexClientTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_EntityHelper.xml b/.idea/runConfigurations/cortex_EntityHelper.xml
deleted file mode 100644
index e38521624e..0000000000
--- a/.idea/runConfigurations/cortex_EntityHelper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/EntityHelper" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.services.EntityHelperTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_JobSrv.xml b/.idea/runConfigurations/cortex_JobSrv.xml
deleted file mode 100644
index 43ba5d8ffb..0000000000
--- a/.idea/runConfigurations/cortex_JobSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/JobSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.services.JobSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_ResponderSrv.xml b/.idea/runConfigurations/cortex_ResponderSrv.xml
deleted file mode 100644
index 2c0a3f1760..0000000000
--- a/.idea/runConfigurations/cortex_ResponderSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/ResponderSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.services.ResponderSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_ServiceHelper.xml b/.idea/runConfigurations/cortex_ServiceHelper.xml
deleted file mode 100644
index 0ce6cc7d84..0000000000
--- a/.idea/runConfigurations/cortex_ServiceHelper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/ServiceHelper" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.services.ServiceHelperTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_v0_AnalyzerCtrl.xml b/.idea/runConfigurations/cortex_v0_AnalyzerCtrl.xml
deleted file mode 100644
index 62052f98ab..0000000000
--- a/.idea/runConfigurations/cortex_v0_AnalyzerCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/v0.AnalyzerCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.controllers.v0.AnalyzerCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_v0_JobCtrl.xml b/.idea/runConfigurations/cortex_v0_JobCtrl.xml
deleted file mode 100644
index 8a4cf4076d..0000000000
--- a/.idea/runConfigurations/cortex_v0_JobCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/v0.JobCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.controllers.v0.JobCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cortex_v0_ReportCtrl.xml b/.idea/runConfigurations/cortex_v0_ReportCtrl.xml
deleted file mode 100644
index 1dccd1353c..0000000000
--- a/.idea/runConfigurations/cortex_v0_ReportCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="cortex/v0.ReportCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="cortex" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-cortex" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.cortex.controllers.v0.ReportCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/misp_Import.xml b/.idea/runConfigurations/misp_Import.xml
deleted file mode 100644
index 84518e23d8..0000000000
--- a/.idea/runConfigurations/misp_Import.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="misp/Import" type="Specs2RunConfiguration" factoryName="Specs2" folderName="misp" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-misp" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.connector.misp.services.MispImportSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Application.xml b/.idea/runConfigurations/scalligraph_Application.xml
deleted file mode 100644
index 6d2cc18120..0000000000
--- a/.idea/runConfigurations/scalligraph_Application.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Application" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.ScalligraphApplicationTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Callback.xml b/.idea/runConfigurations/scalligraph_Callback.xml
deleted file mode 100644
index ea3579a3c6..0000000000
--- a/.idea/runConfigurations/scalligraph_Callback.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Callback" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.models.CallbackTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Cardinality.xml b/.idea/runConfigurations/scalligraph_Cardinality.xml
deleted file mode 100644
index cdc076327f..0000000000
--- a/.idea/runConfigurations/scalligraph_Cardinality.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Cardinality" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.models.CardinalityTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Controller.xml b/.idea/runConfigurations/scalligraph_Controller.xml
deleted file mode 100644
index 98f53366da..0000000000
--- a/.idea/runConfigurations/scalligraph_Controller.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Controller" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.controllers.ControllerTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_FPath.xml b/.idea/runConfigurations/scalligraph_FPath.xml
deleted file mode 100644
index da23a95012..0000000000
--- a/.idea/runConfigurations/scalligraph_FPath.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/FPath" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.FPathTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Fields.xml b/.idea/runConfigurations/scalligraph_Fields.xml
deleted file mode 100644
index 4fd0933557..0000000000
--- a/.idea/runConfigurations/scalligraph_Fields.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Fields" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.controllers.FieldsTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_FieldsParserMacro.xml b/.idea/runConfigurations/scalligraph_FieldsParserMacro.xml
deleted file mode 100644
index 8ca5bb5846..0000000000
--- a/.idea/runConfigurations/scalligraph_FieldsParserMacro.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/FieldsParserMacro" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.controllers.FieldsParserMacroTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Index.xml b/.idea/runConfigurations/scalligraph_Index.xml
deleted file mode 100644
index ba49456ac1..0000000000
--- a/.idea/runConfigurations/scalligraph_Index.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Index" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.models.IndexTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Modern.xml b/.idea/runConfigurations/scalligraph_Modern.xml
deleted file mode 100644
index 0c983e8481..0000000000
--- a/.idea/runConfigurations/scalligraph_Modern.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Modern" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.models.ModernTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Query.xml b/.idea/runConfigurations/scalligraph_Query.xml
deleted file mode 100644
index 94954378dc..0000000000
--- a/.idea/runConfigurations/scalligraph_Query.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Query" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.models.QueryTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_Retry.xml b/.idea/runConfigurations/scalligraph_Retry.xml
deleted file mode 100644
index 24fb112a83..0000000000
--- a/.idea/runConfigurations/scalligraph_Retry.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/Retry" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.RetryTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_SimpleEntity.xml b/.idea/runConfigurations/scalligraph_SimpleEntity.xml
deleted file mode 100644
index 484b111da9..0000000000
--- a/.idea/runConfigurations/scalligraph_SimpleEntity.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/SimpleEntity" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.models.SimpleEntityTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_StorageSrv.xml b/.idea/runConfigurations/scalligraph_StorageSrv.xml
deleted file mode 100644
index cee02ae686..0000000000
--- a/.idea/runConfigurations/scalligraph_StorageSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/StorageSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.services.StorageSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/scalligraph_UpdateFieldsParserMacro.xml b/.idea/runConfigurations/scalligraph_UpdateFieldsParserMacro.xml
deleted file mode 100644
index 460ba8cc45..0000000000
--- a/.idea/runConfigurations/scalligraph_UpdateFieldsParserMacro.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="scalligraph/UpdateFieldsParserMacro" type="Specs2RunConfiguration" factoryName="Specs2" folderName="scalligraph" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="scalligraph-core-test" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.scalligraph.controllers.UpdateFieldsParserMacroTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_AlertSrv.xml b/.idea/runConfigurations/thehive_AlertSrv.xml
deleted file mode 100644
index f9ce3e0601..0000000000
--- a/.idea/runConfigurations/thehive_AlertSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/AlertSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.services.AlertSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_CaseSrv.xml b/.idea/runConfigurations/thehive_CaseSrv.xml
deleted file mode 100644
index 9a368c5986..0000000000
--- a/.idea/runConfigurations/thehive_CaseSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/CaseSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.services.CaseSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_DashboardSrv.xml b/.idea/runConfigurations/thehive_DashboardSrv.xml
deleted file mode 100644
index d9c5acf444..0000000000
--- a/.idea/runConfigurations/thehive_DashboardSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/DashboardSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.services.DashboardSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_Functional.xml b/.idea/runConfigurations/thehive_Functional.xml
deleted file mode 100644
index f641683454..0000000000
--- a/.idea/runConfigurations/thehive_Functional.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/Functional" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.FunctionalTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_OrganisationSrv.xml b/.idea/runConfigurations/thehive_OrganisationSrv.xml
deleted file mode 100644
index 523c373a1b..0000000000
--- a/.idea/runConfigurations/thehive_OrganisationSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/OrganisationSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.services.OrganisationSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_UserSrv.xml b/.idea/runConfigurations/thehive_UserSrv.xml
deleted file mode 100644
index 6cf8cfa4ef..0000000000
--- a/.idea/runConfigurations/thehive_UserSrv.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/UserSrv" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.services.UserSrvTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_notification_template.xml b/.idea/runConfigurations/thehive_notification_template.xml
deleted file mode 100644
index cb4798d853..0000000000
--- a/.idea/runConfigurations/thehive_notification_template.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/notification/template" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.services.notification.notifiers.NotificationTemplateTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_AlertCtrl.xml b/.idea/runConfigurations/thehive_v0_AlertCtrl.xml
deleted file mode 100644
index 05b84b8bb3..0000000000
--- a/.idea/runConfigurations/thehive_v0_AlertCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.AlertCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.AlertCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_AttachmentCtrl.xml b/.idea/runConfigurations/thehive_v0_AttachmentCtrl.xml
deleted file mode 100644
index 9f399f4a57..0000000000
--- a/.idea/runConfigurations/thehive_v0_AttachmentCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.AttachmentCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.AttachmentCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_AttachmentCtrl2.xml b/.idea/runConfigurations/thehive_v0_AttachmentCtrl2.xml
deleted file mode 100644
index 9f399f4a57..0000000000
--- a/.idea/runConfigurations/thehive_v0_AttachmentCtrl2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.AttachmentCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.AttachmentCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_CaseCtrl.xml b/.idea/runConfigurations/thehive_v0_CaseCtrl.xml
deleted file mode 100644
index 39b18c0567..0000000000
--- a/.idea/runConfigurations/thehive_v0_CaseCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.CaseCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.CaseCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_CaseTemplateCtrl.xml b/.idea/runConfigurations/thehive_v0_CaseTemplateCtrl.xml
deleted file mode 100644
index 0939f2b322..0000000000
--- a/.idea/runConfigurations/thehive_v0_CaseTemplateCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.CaseTemplateCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.CaseTemplateCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_CaseTemplateCtrl2.xml b/.idea/runConfigurations/thehive_v0_CaseTemplateCtrl2.xml
deleted file mode 100644
index 0939f2b322..0000000000
--- a/.idea/runConfigurations/thehive_v0_CaseTemplateCtrl2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.CaseTemplateCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.CaseTemplateCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_CustomFieldCtrl.xml b/.idea/runConfigurations/thehive_v0_CustomFieldCtrl.xml
deleted file mode 100644
index d72ff5659f..0000000000
--- a/.idea/runConfigurations/thehive_v0_CustomFieldCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.CustomFieldCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.CustomFieldCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_DashboardCtrl.xml b/.idea/runConfigurations/thehive_v0_DashboardCtrl.xml
deleted file mode 100644
index 2bc75a1d0d..0000000000
--- a/.idea/runConfigurations/thehive_v0_DashboardCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.DashboardCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.DashboardCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_LogCtrl.xml b/.idea/runConfigurations/thehive_v0_LogCtrl.xml
deleted file mode 100644
index 3f09c665bf..0000000000
--- a/.idea/runConfigurations/thehive_v0_LogCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.LogCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.LogCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_LogCtrl2.xml b/.idea/runConfigurations/thehive_v0_LogCtrl2.xml
deleted file mode 100644
index 3f09c665bf..0000000000
--- a/.idea/runConfigurations/thehive_v0_LogCtrl2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.LogCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.LogCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_ObservableCtrl.xml b/.idea/runConfigurations/thehive_v0_ObservableCtrl.xml
deleted file mode 100644
index af9b51346f..0000000000
--- a/.idea/runConfigurations/thehive_v0_ObservableCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.ObservableCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.ObservableCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_ObservableCtrl2.xml b/.idea/runConfigurations/thehive_v0_ObservableCtrl2.xml
deleted file mode 100644
index af9b51346f..0000000000
--- a/.idea/runConfigurations/thehive_v0_ObservableCtrl2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.ObservableCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.ObservableCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_OrganisationCtrl.xml b/.idea/runConfigurations/thehive_v0_OrganisationCtrl.xml
deleted file mode 100644
index c083f0190f..0000000000
--- a/.idea/runConfigurations/thehive_v0_OrganisationCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.OrganisationCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.OrganisationCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_ProfileCtrl.xml b/.idea/runConfigurations/thehive_v0_ProfileCtrl.xml
deleted file mode 100644
index f9fa89e9c9..0000000000
--- a/.idea/runConfigurations/thehive_v0_ProfileCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.ProfileCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.ProfileCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_Query.xml b/.idea/runConfigurations/thehive_v0_Query.xml
deleted file mode 100644
index 6dd28e31a5..0000000000
--- a/.idea/runConfigurations/thehive_v0_Query.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.Query" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.QueryTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_ShareCtrl.xml b/.idea/runConfigurations/thehive_v0_ShareCtrl.xml
deleted file mode 100644
index 897700d845..0000000000
--- a/.idea/runConfigurations/thehive_v0_ShareCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.ShareCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.ShareCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_StatusCtrl.xml b/.idea/runConfigurations/thehive_v0_StatusCtrl.xml
deleted file mode 100644
index 18a2d43738..0000000000
--- a/.idea/runConfigurations/thehive_v0_StatusCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.StatusCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.StatusCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_StatusCtrl2.xml b/.idea/runConfigurations/thehive_v0_StatusCtrl2.xml
deleted file mode 100644
index 18a2d43738..0000000000
--- a/.idea/runConfigurations/thehive_v0_StatusCtrl2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.StatusCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.StatusCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_TagCtrl.xml b/.idea/runConfigurations/thehive_v0_TagCtrl.xml
deleted file mode 100644
index 38138bd877..0000000000
--- a/.idea/runConfigurations/thehive_v0_TagCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.TagCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.TagCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_TaskCtrl.xml b/.idea/runConfigurations/thehive_v0_TaskCtrl.xml
deleted file mode 100644
index c608f7613c..0000000000
--- a/.idea/runConfigurations/thehive_v0_TaskCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.TaskCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.TaskCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_UserCtrl.xml b/.idea/runConfigurations/thehive_v0_UserCtrl.xml
deleted file mode 100644
index a5089e7665..0000000000
--- a/.idea/runConfigurations/thehive_v0_UserCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.UserCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.UserCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v0_UserCtrl2.xml b/.idea/runConfigurations/thehive_v0_UserCtrl2.xml
deleted file mode 100644
index a5089e7665..0000000000
--- a/.idea/runConfigurations/thehive_v0_UserCtrl2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v0.UserCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v0" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v0.UserCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v1_AlertCtrl.xml b/.idea/runConfigurations/thehive_v1_AlertCtrl.xml
deleted file mode 100644
index 60cae05e76..0000000000
--- a/.idea/runConfigurations/thehive_v1_AlertCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v1.AlertCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v1" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v1.AlertCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v1_CaseCtrl.xml b/.idea/runConfigurations/thehive_v1_CaseCtrl.xml
deleted file mode 100644
index 56bbac7ba4..0000000000
--- a/.idea/runConfigurations/thehive_v1_CaseCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v1.CaseCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v1" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v1.CaseCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v1_OrganisationCtrl.xml b/.idea/runConfigurations/thehive_v1_OrganisationCtrl.xml
deleted file mode 100644
index f6aab95437..0000000000
--- a/.idea/runConfigurations/thehive_v1_OrganisationCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v1.OrganisationCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v1" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v1.OrganisationCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/thehive_v1_UserCtrl.xml b/.idea/runConfigurations/thehive_v1_UserCtrl.xml
deleted file mode 100644
index bab9c7c972..0000000000
--- a/.idea/runConfigurations/thehive_v1_UserCtrl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="thehive/v1.UserCtrl" type="Specs2RunConfiguration" factoryName="Specs2" folderName="thehive.v1" show_console_on_std_err="false" show_console_on_std_out="false">
-    <module name="thehive-core" />
-    <option name="allowRunningInParallel" value="false" />
-    <option name="testKind" value="Class" />
-    <option name="envs">
-      <map />
-    </option>
-    <option name="javaOptions" value="-Dlogger.file=conf/logback.xml" />
-    <option name="jrePath" />
-    <option name="searchTest" value="Across module dependencies" />
-    <option name="showProgressMessages" value="true" />
-    <option name="testArgs" value="" />
-    <option name="testClassPath" value="org.thp.thehive.controllers.v1.UserCtrlTest" />
-    <option name="useSbt" value="false" />
-    <option name="useUiWithSbt" value="false" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 3843d59dbf..97286da352 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 2.3.2
+version = 2.6.4
 project.git = true
 align = more    # For pretty alignment.
 assumeStandardLibraryStripMargin = true
diff --git a/ScalliGraph b/ScalliGraph
index 36b47d6920..7eafad1cee 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit 36b47d6920d09ceeb721b36e3c6e907b3a293578
+Subproject commit 7eafad1cee2f24fd9ad8402a307ccbaff8f36d11
diff --git a/conf/logback.xml b/conf/logback.xml
index 6a19ad03ed..52ba1c47b9 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -35,7 +35,7 @@
     </appender>
 
     <logger name="org.thp.scalligraph.models" level="TRACE"/>
-    <logger name="org.thp.scalligraph.steps" level="TRACE"/>
+    <logger name="org.thp.scalligraph.traversal" level="TRACE"/>
     <!--
     <logger name="org.janusgraph.graphdb" level="INFO" />
     <logger name="org.thp.thehive.client" level="DEBUG" />
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/ActionCtrl.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/ActionCtrl.scala
index 4470560bde..7b92fdde83 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/ActionCtrl.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/ActionCtrl.scala
@@ -5,22 +5,22 @@ import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity, Schema}
 import org.thp.scalligraph.query.{ParamQuery, PublicProperty, Query, SubType}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{PagedResult, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.dto.v0.InputAction
-import org.thp.thehive.connector.cortex.models.{ActionContext, RichAction}
-import org.thp.thehive.connector.cortex.services.{ActionSrv, ActionSteps, EntityHelper}
+import org.thp.thehive.connector.cortex.models.{Action, ActionContext, RichAction}
+import org.thp.thehive.connector.cortex.services.ActionOps._
+import org.thp.thehive.connector.cortex.services.{ActionSrv, EntityHelper}
 import org.thp.thehive.controllers.v0.Conversion.{toObjectType, _}
 import org.thp.thehive.controllers.v0.{AuditRenderer, IdOrName, OutputParam, QueryableCtrl}
 import org.thp.thehive.models._
 import org.thp.thehive.services._
 import play.api.libs.json.{JsObject, Json, OWrites}
-import play.api.mvc.{Action, AnyContent, Results}
+import play.api.mvc.{AnyContent, Results, Action => PlayAction}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.reflect.runtime.{universe => ru}
-
 @Singleton
 class ActionCtrl @Inject() (
     entrypoint: Entrypoint,
@@ -48,42 +48,41 @@ class ActionCtrl @Inject() (
           case a: Alert      => alertToJson(alertSrv.get(a)).getOrFail("Alert")
         }
       }
-      .getOrElse(Json.obj("_type" -> entity._model.label, "_id" -> entity._id))
+      .getOrElse(Json.obj("_type" -> entity._label, "_id" -> entity._id))
   }
 
   override val entityName: String                           = "action"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.action ::: metaProperties[ActionSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.action
   override val initialQuery: Query =
-    Query.init[ActionSteps]("listAction", (graph, authContext) => actionSrv.initSteps(graph).visible(authContext))
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, ActionSteps](
+    Query.init[Traversal.V[Action]]("listAction", (graph, authContext) => actionSrv.startTraversal(graph).visible(authContext))
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Action]](
     "getAction",
     FieldsParser[IdOrName],
     (param, graph, authContext) => actionSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, ActionSteps, PagedResult[RichAction]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Action], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, actionSteps, _) => actionSteps.richPage(range.from, range.to, withTotal = true)(_.richAction)
   )
-  override val outputQuery: Query = Query.output[RichAction, ActionSteps](_.richAction)
+  override val outputQuery: Query = Query.output[RichAction, Traversal.V[Action]](_.richAction)
 
   val actionsQuery: Query = new Query {
     override val name: String = "actions"
     override def checkFrom(t: ru.Type): Boolean =
-      SubType(t, ru.typeOf[CaseSteps]) || SubType(t, ru.typeOf[ObservableSteps]) ||
-        SubType(t, ru.typeOf[TaskSteps]) ||
-        SubType(t, ru.typeOf[LogSteps]) ||
-        SubType(t, ru.typeOf[AlertSteps])
-    override def toType(t: ru.Type): ru.Type = ru.typeOf[ActionSteps]
-    override def apply(param: Unit, from: Any, authContext: AuthContext): Any = {
-      val fromSteps = from.asInstanceOf[VertexSteps[_]]
-      new ActionSteps(from.asInstanceOf[VertexSteps[_]].inTo[ActionContext].raw)(db, fromSteps.graph, schema)
-    }
+      SubType(t, ru.typeOf[Traversal.V[Case]]) || SubType(t, ru.typeOf[Traversal.V[Observable]]) ||
+        SubType(t, ru.typeOf[Traversal.V[Task]]) ||
+        SubType(t, ru.typeOf[Traversal.V[Log]]) ||
+        SubType(t, ru.typeOf[Traversal.V[Alert]])
+    override def toType(t: ru.Type): ru.Type = ru.typeOf[Traversal.V[Action]]
+
+    override def apply(param: Unit, fromType: ru.Type, from: Any, authContext: AuthContext): Any =
+      from.asInstanceOf[Traversal.V[_]].in[ActionContext].v[Action]
   }
 
   override val extraQueries: Seq[ParamQuery[_]] = Seq(actionsQuery)
 
-  def create: Action[AnyContent] =
+  def create: PlayAction[AnyContent] =
     entrypoint("create action")
       .extract("action", FieldsParser[InputAction])
       .asyncAuth { implicit request =>
@@ -97,7 +96,7 @@ class ActionCtrl @Inject() (
         } yield Results.Ok(action.toJson)
       }
 
-  def getByEntity(objectType: String, objectId: String): Action[AnyContent] =
+  def getByEntity(objectType: String, objectId: String): PlayAction[AnyContent] =
     entrypoint("get by entity")
       .authRoTransaction(db) { implicit request => implicit graph =>
         for {
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrl.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrl.scala
index bd7dcb5c82..3a88f5a331 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrl.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrl.scala
@@ -7,12 +7,12 @@ import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FFile, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.dto.v0.InputAnalyzerTemplate
 import org.thp.thehive.connector.cortex.models.AnalyzerTemplate
-import org.thp.thehive.connector.cortex.services.{AnalyzerTemplateSrv, AnalyzerTemplateSteps}
+import org.thp.thehive.connector.cortex.services.AnalyzerTemplateSrv
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.controllers.v0.{IdOrName, OutputParam, QueryableCtrl}
 import org.thp.thehive.models.Permissions
@@ -32,19 +32,20 @@ class AnalyzerTemplateCtrl @Inject() (
 
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "analyzerTemplate"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.analyzerTemplate ::: metaProperties[AnalyzerTemplateSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.analyzerTemplate
   override val initialQuery: Query =
-    Query.init[AnalyzerTemplateSteps]("listAnalyzerTemplate", (graph, _) => analyzerTemplateSrv.initSteps(graph))
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, AnalyzerTemplateSteps](
+    Query.init[Traversal.V[AnalyzerTemplate]]("listAnalyzerTemplate", (graph, _) => analyzerTemplateSrv.startTraversal(graph))
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[AnalyzerTemplate]](
     "getReportTemplace",
     FieldsParser[IdOrName],
     (param, graph, _) => analyzerTemplateSrv.get(param.idOrName)(graph)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, AnalyzerTemplateSteps, PagedResult[AnalyzerTemplate with Entity]](
-    "page",
-    FieldsParser[OutputParam],
-    (range, AnalyzerTemplateSteps, _) => AnalyzerTemplateSteps.page(range.from, range.to, withTotal = true)
-  )
+  override val pageQuery: ParamQuery[OutputParam] =
+    Query.withParam[OutputParam, Traversal.V[AnalyzerTemplate], IteratorOutput](
+      "page",
+      FieldsParser[OutputParam],
+      (range, analyzerTemplateTraversal, _) => analyzerTemplateTraversal.page(range.from, range.to, withTotal = true)
+    )
   override val outputQuery: Query = Query.output[AnalyzerTemplate with Entity]
 
   def get(id: String): Action[AnyContent] =
@@ -87,7 +88,7 @@ class AnalyzerTemplateCtrl @Inject() (
       .authPermittedTransaction(db, Permissions.manageAnalyzerTemplate) { implicit request => implicit graph =>
         analyzerTemplateSrv
           .get(id)
-          .getOrFail()
+          .getOrFail("AnalyzerTemplate")
           .map { analyzerTemplate =>
             analyzerTemplateSrv.remove(analyzerTemplate)
             Results.NoContent
@@ -101,8 +102,8 @@ class AnalyzerTemplateCtrl @Inject() (
         val propertyUpdaters: Seq[PropertyUpdater] = request.body("template")
 
         for {
-          (templateSteps, _) <- analyzerTemplateSrv.update(_.get(id), propertyUpdaters)
-          template           <- templateSteps.getOrFail()
+          (templateSteps, _) <- analyzerTemplateSrv.update(_.getByIds(id), propertyUpdaters)
+          template           <- templateSteps.getOrFail("AnalyzerTemplate")
         } yield Results.Ok(template.toJson)
 
       }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Conversion.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Conversion.scala
index cec2813f42..57eab42eb1 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Conversion.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Conversion.scala
@@ -12,20 +12,20 @@ import play.api.libs.json.{JsArray, JsFalse, JsObject, Json}
 object Conversion {
   import org.thp.thehive.controllers.v0.Conversion._
 
-  implicit val actionOutput: Renderer.Aux[RichAction, OutputAction] = Renderer.json[RichAction, OutputAction](
+  implicit val actionOutput: Renderer.Aux[RichAction, OutputAction] = Renderer.toJson[RichAction, OutputAction](
     _.into[OutputAction]
       .withFieldRenamed(_.workerId, _.responderId)
       .withFieldRenamed(_.workerName, _.responderName)
       .withFieldRenamed(_.workerDefinition, _.responderDefinition)
       .withFieldComputed(_.status, _.status.toString)
       .withFieldComputed(_.objectId, _.context._id)
-      .withFieldComputed(_.objectType, _.context._model.label)
+      .withFieldComputed(_.objectType, _.context._label)
       .withFieldComputed(_.operations, a => JsArray(a.operations).toString)
       .withFieldComputed(_.report, _.report.map(_.toString).getOrElse("{}"))
       .transform
   )
 
-  implicit val jobOutput: Renderer.Aux[RichJob, OutputJob] = Renderer.json[RichJob, OutputJob](job =>
+  implicit val jobOutput: Renderer.Aux[RichJob, OutputJob] = Renderer.toJson[RichJob, OutputJob](job =>
     job
       .into[OutputJob]
       .withFieldComputed(_.analyzerId, _.workerId)
@@ -50,7 +50,7 @@ object Conversion {
   )
 
   implicit val jobWithParentOutput: Renderer.Aux[(RichJob, Option[(RichObservable, RichCase)]), OutputJob] =
-    Renderer.json[(RichJob, Option[(RichObservable, RichCase)]), OutputJob] { jobWithParent =>
+    Renderer.toJson[(RichJob, Option[(RichObservable, RichCase)]), OutputJob] { jobWithParent =>
       jobWithParent
         ._1
         .into[OutputJob]
@@ -82,7 +82,7 @@ object Conversion {
     }
 
   implicit val analyzerTemplateOutput: Renderer.Aux[AnalyzerTemplate with Entity, OutputAnalyzerTemplate] =
-    Renderer.json[AnalyzerTemplate with Entity, OutputAnalyzerTemplate](at =>
+    Renderer.toJson[AnalyzerTemplate with Entity, OutputAnalyzerTemplate](at =>
       at.asInstanceOf[AnalyzerTemplate]
         .into[OutputAnalyzerTemplate]
         .withFieldComputed(_.analyzerId, _.workerId)
@@ -91,7 +91,7 @@ object Conversion {
         .transform
     )
 
-  implicit class InputAnalyzerTemplateOps(inputAnalyzerTemplate: InputAnalyzerTemplate) {
+  implicit class InputAnalyzerTemplateOpsDefs(inputAnalyzerTemplate: InputAnalyzerTemplate) {
 
     def toAnalyzerTemplate: AnalyzerTemplate =
       inputAnalyzerTemplate
@@ -101,7 +101,7 @@ object Conversion {
   }
 
   implicit val workerOutput: Renderer.Aux[(CortexWorker, Seq[String]), OutputWorker] =
-    Renderer.json[(CortexWorker, Seq[String]), OutputWorker](worker =>
+    Renderer.toJson[(CortexWorker, Seq[String]), OutputWorker](worker =>
       worker
         ._1
         .into[OutputWorker]
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/CortexQueryExecutor.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/CortexQueryExecutor.scala
index 461b16dd66..75b95fae78 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/CortexQueryExecutor.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/CortexQueryExecutor.scala
@@ -8,11 +8,12 @@ import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.FieldsParser
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{BaseTraversal, BaseVertexSteps}
-import org.thp.thehive.connector.cortex.services.{JobSteps, RichObservableSteps}
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.connector.cortex.models.Job
+import org.thp.thehive.connector.cortex.services.JobOps._
 import org.thp.thehive.controllers.v0._
-import org.thp.thehive.services.ObservableSteps
+import org.thp.thehive.models.Observable
 
 import scala.reflect.runtime.{universe => ru}
 
@@ -37,10 +38,10 @@ class CortexQueryExecutor @Inject() (
       controllers.flatMap(_.extraQueries)
 
   val childTypes: PartialFunction[(ru.Type, String), ru.Type] = {
-    case (tpe, "case_artifact_job") if SubType(tpe, ru.typeOf[ObservableSteps]) => ru.typeOf[ObservableSteps]
+    case (tpe, "case_artifact_job") if SubType(tpe, ru.typeOf[Traversal.V[Observable]]) => ru.typeOf[Traversal.V[Observable]]
   }
   val parentTypes: PartialFunction[ru.Type, ru.Type] = {
-    case tpe if SubType(tpe, ru.typeOf[JobSteps]) => ru.typeOf[ObservableSteps]
+    case tpe if SubType(tpe, ru.typeOf[Traversal.V[Job]]) => ru.typeOf[Traversal.V[Observable]]
   }
 
   override val customFilterQuery: FilterQuery = FilterQuery(db, publicProperties) { (tpe, globalParser) =>
@@ -62,16 +63,17 @@ class CortexQueryExecutor @Inject() (
   val analyzerTemplate: QueryCtrl = queryCtrlBuilder(analyzerTemplateCtrl, this)
 }
 
-class CortexParentIdInputFilter(parentId: String) extends InputFilter {
-  override def apply[S <: BaseTraversal](
+class CortexParentIdInputFilter(parentId: String) extends InputQuery[Traversal.Unk, Traversal.Unk] {
+  override def apply(
       db: Database,
       publicProperties: List[PublicProperty[_, _]],
-      stepType: ru.Type,
-      step: S,
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
       authContext: AuthContext
-  ): S =
-    if (stepType =:= ru.typeOf[JobSteps]) step.asInstanceOf[JobSteps].filter(_.observable.getByIds(parentId)).asInstanceOf[S]
-    else throw BadRequestError(s"$stepType hasn't parent")
+  ): Traversal.Unk =
+    if (traversalType =:= ru.typeOf[Traversal.V[Job]])
+      traversal.asInstanceOf[Traversal.V[Job]].filter(_.observable.getByIds(parentId)).asInstanceOf[Traversal.Unk]
+    else throw BadRequestError(s"$traversalType hasn't parent")
 }
 
 /**
@@ -79,28 +81,45 @@ class CortexParentIdInputFilter(parentId: String) extends InputFilter {
   *
   * @param parentFilter the query
   */
-class CortexParentQueryInputFilter(parentFilter: InputFilter) extends InputFilter {
-  override def apply[S <: BaseTraversal](
+class CortexParentQueryInputFilter(parentFilter: InputQuery[Traversal.Unk, Traversal.Unk]) extends InputQuery[Traversal.Unk, Traversal.Unk] {
+  override def apply(
       db: Database,
       publicProperties: List[PublicProperty[_, _]],
-      stepType: ru.Type,
-      step: S,
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
       authContext: AuthContext
-  ): S =
-    if (stepType =:= ru.typeOf[JobSteps])
-      step.filter(t => parentFilter.apply(db, publicProperties, ru.typeOf[ObservableSteps], t.asInstanceOf[JobSteps].observable, authContext))
-    else throw BadRequestError(s"$stepType hasn't parent")
+  ): Traversal.Unk = {
+    def filter[F, T: ru.TypeTag](t: Traversal.V[F] => Traversal.V[T]): Traversal.Unk =
+      parentFilter(
+        db,
+        publicProperties,
+        ru.typeOf[Traversal.V[T]],
+        t(traversal.asInstanceOf[Traversal.V[F]]).asInstanceOf[Traversal.Unk],
+        authContext
+      )
+    if (traversalType =:= ru.typeOf[Traversal.V[Job]]) filter[Job, Observable](_.observable)
+    else throw BadRequestError(s"$traversalType hasn't parent")
+  }
 }
 
-class CortexChildQueryInputFilter(childType: String, childFilter: InputFilter) extends InputFilter {
-  override def apply[S <: BaseVertexSteps](
+class CortexChildQueryInputFilter(childType: String, childFilter: InputQuery[Traversal.Unk, Traversal.Unk])
+    extends InputQuery[Traversal.Unk, Traversal.Unk] {
+  override def apply(
       db: Database,
       publicProperties: List[PublicProperty[_, _]],
-      stepType: ru.Type,
-      step: S,
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
       authContext: AuthContext
-  ): S =
-    if (stepType =:= ru.typeOf[ObservableSteps] && childType == "case_artifact_job")
-      step.filter(t => childFilter.apply(db, publicProperties, ru.typeOf[JobSteps], t.asInstanceOf[ObservableSteps].jobs, authContext))
-    else throw BadRequestError(s"$stepType hasn't child of type $childType")
+  ): Traversal.Unk = {
+    def filter[F, T: ru.TypeTag](t: Traversal.V[F] => Traversal.V[T]): Traversal.Unk =
+      childFilter(
+        db,
+        publicProperties,
+        ru.typeOf[Traversal.V[T]],
+        t(traversal.asInstanceOf[Traversal.V[F]]).asInstanceOf[Traversal.Unk],
+        authContext
+      )
+    if (traversalType =:= ru.typeOf[Traversal.V[Observable]] && childType == "case_artifact_job") filter[Observable, Job](_.jobs)
+    else throw BadRequestError(s"$traversalType hasn't child of type $childType")
+  }
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala
index 7ffc0748cb..84da6d1632 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrl.scala
@@ -5,16 +5,18 @@ import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.scalligraph.{AuthorizationError, ErrorHandler}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
-import org.thp.thehive.connector.cortex.models.{ObservableJob, RichJob}
-import org.thp.thehive.connector.cortex.services.{JobSrv, JobSteps}
+import org.thp.thehive.connector.cortex.models.{Job, RichJob}
+import org.thp.thehive.connector.cortex.services.JobOps._
+import org.thp.thehive.connector.cortex.services.JobSrv
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.controllers.v0.{IdOrName, OutputParam, QueryableCtrl}
 import org.thp.thehive.models.{Permissions, RichCase, RichObservable}
-import org.thp.thehive.services.{ObservableSrv, ObservableSteps}
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.ObservableSrv
 import play.api.Logger
 import play.api.mvc.{Action, AnyContent, Results}
 
@@ -33,31 +35,25 @@ class JobCtrl @Inject() (
     with JobRenderer {
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "job"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.job ::: metaProperties[JobSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.job
   override val initialQuery: Query =
-    Query.init[JobSteps]("listJob", (graph, authContext) => jobSrv.initSteps(graph).visible(authContext))
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, JobSteps](
+    Query.init[Traversal.V[Job]]("listJob", (graph, authContext) => jobSrv.startTraversal(graph).visible(authContext))
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Job]](
     "getJob",
     FieldsParser[IdOrName],
     (param, graph, authContext) => jobSrv.get(param.idOrName)(graph).visible(authContext)
   )
   override val pageQuery: ParamQuery[OutputParam] =
-    Query.withParam[OutputParam, JobSteps, PagedResult[(RichJob, Option[(RichObservable, RichCase)])]](
+    Query.withParam[OutputParam, Traversal.V[Job], IteratorOutput](
       "page",
       FieldsParser[OutputParam], {
         case (OutputParam(from, to, _, withParents), jobSteps, authContext) if withParents > 0 =>
           jobSteps.richPage(from, to, withTotal = true)(_.richJobWithCustomRenderer(jobParents(_)(authContext))(authContext))
-        case (range, jobSteps, authContext) => jobSteps.richPage(range.from, range.to, withTotal = true)(_.richJob(authContext).map((_, None)))
+        case (range, jobSteps, authContext) =>
+          jobSteps.richPage(range.from, range.to, withTotal = true)(_.richJob(authContext).domainMap((_, None: Option[(RichObservable, RichCase)])))
       }
     )
-  override val outputQuery: Query = Query.outputWithContext[RichJob, JobSteps]((jobSteps, authContext) => jobSteps.richJob(authContext))
-
-  override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[ObservableSteps, JobSteps](
-      "jobs",
-      (observableSteps, _) => new JobSteps(observableSteps.outTo[ObservableJob].raw)(db, observableSteps.graph)
-    )
-  )
+  override val outputQuery: Query = Query.outputWithContext[RichJob, Traversal.V[Job]]((jobSteps, authContext) => jobSteps.richJob(authContext))
 
   def get(jobId: String): Action[AnyContent] =
     entrypoint("get job")
@@ -66,7 +62,7 @@ class JobCtrl @Inject() (
           .getByIds(jobId)
           .visible
           .richJob
-          .getOrFail()
+          .getOrFail("Job")
           .map(job => Results.Ok(job.toJson))
       }
 
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobRenderer.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobRenderer.scala
index c8f162feff..2b8ee12e95 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobRenderer.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/JobRenderer.scala
@@ -1,14 +1,19 @@
 package org.thp.thehive.connector.cortex.controllers.v0
 
+import java.util.{Map => JMap}
+
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
-import org.thp.thehive.connector.cortex.services.JobSteps
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.thehive.connector.cortex.models.Job
+import org.thp.thehive.connector.cortex.services.JobOps._
 import org.thp.thehive.models.{RichCase, RichObservable}
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
 
 trait JobRenderer {
-  def jobParents(
-      jobSteps: JobSteps
-  )(implicit authContext: AuthContext): Traversal[Option[(RichObservable, RichCase)], Option[(RichObservable, RichCase)]] =
-    jobSteps.observable.project(_.by(_.richObservable).by(_.`case`.richCase)).map(Some(_))
+  def jobParents(traversal: Traversal.V[Job])(
+      implicit authContext: AuthContext
+  ): Traversal[Option[(RichObservable, RichCase)], JMap[String, Any], Converter[Option[(RichObservable, RichCase)], JMap[String, Any]]] =
+    traversal.observable.project(_.by(_.richObservable).by(_.`case`.richCase)).domainMap(Some(_))
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Properties.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Properties.scala
index 15170e1c22..d2a3673eed 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Properties.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Properties.scala
@@ -1,41 +1,41 @@
 package org.thp.thehive.connector.cortex.controllers.v0
 
 import javax.inject.{Inject, Singleton}
-import org.thp.scalligraph.models.UniMapping
+import org.thp.scalligraph.models.UMapping
 import org.thp.scalligraph.query.{PublicProperty, PublicPropertyListBuilder}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.connector.cortex.models.ActionContext
-import org.thp.thehive.connector.cortex.services.{ActionSteps, AnalyzerTemplateSteps, JobSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.connector.cortex.models.{Action, ActionContext, AnalyzerTemplate, Job}
+import org.thp.thehive.connector.cortex.services.ActionOps._
 import org.thp.thehive.controllers.v0.Conversion.fromObjectType
 
 @Singleton
 class Properties @Inject() () {
 
   lazy val action: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[ActionSteps]
-      .property("responderId", UniMapping.string)(_.field.readonly)
-      .property("objectType", UniMapping.string)(_.select(_.context.map(o => fromObjectType(o._model.label))).readonly)
-      .property("status", UniMapping.string)(_.field.readonly)
-      .property("startDate", UniMapping.date)(_.field.readonly)
-      .property("objectId", UniMapping.id)(_.select(_.outTo[ActionContext]._id).readonly)
-      .property("responderName", UniMapping.string.optional)(_.field.readonly)
-      .property("cortexId", UniMapping.string.optional)(_.field.readonly)
-      .property("tlp", UniMapping.int.optional)(_.field.readonly)
+    PublicPropertyListBuilder[Action]
+      .property("responderId", UMapping.string)(_.field.readonly)
+      .property("objectType", UMapping.string)(_.select(_.context.domainMap(o => fromObjectType(o._label))).readonly)
+      .property("status", UMapping.string)(_.field.readonly)
+      .property("startDate", UMapping.date)(_.field.readonly)
+      .property("objectId", UMapping.id)(_.select(_.out[ActionContext]._id).readonly)
+      .property("responderName", UMapping.string.optional)(_.field.readonly)
+      .property("cortexId", UMapping.string.optional)(_.field.readonly)
+      .property("tlp", UMapping.int.optional)(_.field.readonly)
       .build
 
   lazy val analyzerTemplate: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[AnalyzerTemplateSteps]
-      .property("analyzerId", UniMapping.string)(_.rename("workerId").readonly)
-      .property("reportType", UniMapping.string)(_.field.readonly)
-      .property("content", UniMapping.string)(_.field.updatable)
+    PublicPropertyListBuilder[AnalyzerTemplate]
+      .property("analyzerId", UMapping.string)(_.rename("workerId").readonly)
+      .property("reportType", UMapping.string)(_.field.readonly)
+      .property("content", UMapping.string)(_.field.updatable)
       .build
 
   val job: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[JobSteps]
-      .property("analyzerId", UniMapping.string)(_.rename("workerId").readonly)
-      .property("cortexId", UniMapping.string.optional)(_.field.readonly)
-      .property("startDate", UniMapping.date)(_.field.readonly)
-      .property("status", UniMapping.string)(_.field.readonly)
-      .property("analyzerDefinition", UniMapping.string)(_.rename("workerDefinition").readonly)
+    PublicPropertyListBuilder[Job]
+      .property("analyzerId", UMapping.string)(_.rename("workerId").readonly)
+      .property("cortexId", UMapping.string.optional)(_.field.readonly)
+      .property("startDate", UMapping.date)(_.field.readonly)
+      .property("status", UMapping.string)(_.field.readonly)
+      .property("analyzerDefinition", UMapping.string)(_.rename("workerDefinition").readonly)
       .build
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Action.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Action.scala
index a5e7a78c9f..75bce52a40 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Action.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Action.scala
@@ -2,12 +2,13 @@ package org.thp.thehive.connector.cortex.models
 
 import java.util.Date
 
-import gremlin.scala.{Edge, Graph, Vertex}
-import org.thp.scalligraph.VertexEntity
+import org.apache.tinkerpop.gremlin.structure.{Edge, Graph, Vertex}
+import org.thp.scalligraph.BuildVertexEntity
 import org.thp.scalligraph.models._
+import org.thp.scalligraph.traversal.Converter
 import play.api.libs.json.JsObject
 
-@VertexEntity
+@BuildVertexEntity
 case class Action(
     workerId: String,
     workerName: String,
@@ -22,7 +23,7 @@ case class Action(
     operations: Seq[JsObject]
 )
 
-case class RichAction(action: Action with Entity, context: Entity) {
+case class RichAction(action: Action with Entity, context: Product with Entity) {
   def _id: String               = action._id
   def _createdAt: Date          = action._createdAt
   def _createdBy: String        = action._createdBy
@@ -40,32 +41,32 @@ case class RichAction(action: Action with Entity, context: Entity) {
 
 case class ActionContext()
 
-object ActionContext extends HasEdgeModel[ActionContext, Action, Product] {
+object ActionContext extends HasModel {
 
-  override val model: Model.Edge[ActionContext, Action, Product] = new EdgeModel[Action, Product] { thisModel =>
+  override val model: Model.Edge[ActionContext] = new EdgeModel {
     override type E = ActionContext
     override val label: String                                = "ActionContext"
-    override val fromLabel: String                            = "Action"
-    override val toLabel: String                              = ""
     override val indexes: Seq[(IndexType.Value, Seq[String])] = Nil
 
     override val fields: Map[String, Mapping[_, _, _]] = Map.empty
-    override def toDomain(element: Edge)(implicit db: Database): ActionContext with Entity = new ActionContext with Entity {
-      override val _id: String                = element.id().toString
-      override val _model: Model              = thisModel
-      override val _createdBy: String         = db.getProperty(element, "_createdBy", UniMapping.string)
-      override val _updatedBy: Option[String] = db.getProperty(element, "_updatedBy", UniMapping.string.optional)
-      override val _createdAt: Date           = db.getProperty(element, "_createdAt", UniMapping.date)
-      override val _updatedAt: Option[Date]   = db.getProperty(element, "_updatedAt", UniMapping.date.optional)
-    }
-    override def addEntity(a: ActionContext, entity: Entity): EEntity = new ActionContext with Entity {
-      override def _id: String                = entity._id
-      override def _model: Model              = entity._model
-      override def _createdBy: String         = entity._createdBy
-      override def _updatedBy: Option[String] = entity._updatedBy
-      override def _createdAt: Date           = entity._createdAt
-      override def _updatedAt: Option[Date]   = entity._updatedAt
-    }
+    override val converter: Converter[EEntity, Edge] = (element: Edge) =>
+      new ActionContext with Entity {
+        override val _id: String                = element.id().toString
+        override val _label: String             = "ActionContext"
+        override val _createdBy: String         = UMapping.string.getProperty(element, "_createdBy")
+        override val _updatedBy: Option[String] = UMapping.string.optional.getProperty(element, "_updatedBy")
+        override val _createdAt: Date           = UMapping.date.getProperty(element, "_createdAt")
+        override val _updatedAt: Option[Date]   = UMapping.date.optional.getProperty(element, "_updatedAt")
+      }
+    override def addEntity(a: ActionContext, entity: Entity): EEntity =
+      new ActionContext with Entity {
+        override def _id: String                = entity._id
+        override def _label: String             = entity._label
+        override def _createdBy: String         = entity._createdBy
+        override def _updatedBy: Option[String] = entity._updatedBy
+        override def _createdAt: Date           = entity._createdAt
+        override def _updatedAt: Option[Date]   = entity._updatedAt
+      }
     override def create(e: ActionContext, from: Vertex, to: Vertex)(implicit db: Database, graph: Graph): Edge =
       from.addEdge(label, to)
   }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/AnalyzerTemplate.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/AnalyzerTemplate.scala
index 61b4f44868..42d94dfd33 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/AnalyzerTemplate.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/AnalyzerTemplate.scala
@@ -1,6 +1,6 @@
 package org.thp.thehive.connector.cortex.models
 
-import org.thp.scalligraph.VertexEntity
+import org.thp.scalligraph.BuildVertexEntity
 
-@VertexEntity
+@BuildVertexEntity
 case class AnalyzerTemplate(workerId: String, content: String)
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/CortexSchema.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/CortexSchema.scala
index c619e37b75..ef457c42e8 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/CortexSchema.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/CortexSchema.scala
@@ -28,12 +28,12 @@ class CortexSchemaDefinition @Inject() () extends Schema with UpdatableSchema {
   override lazy val modelList: Seq[Model] = {
     val rm: ru.Mirror = ru.runtimeMirror(getClass.getClassLoader)
     reflectionClasses
-      .getSubTypesOf(classOf[HasModel[_]])
+      .getSubTypesOf(classOf[HasModel])
       .asScala
       .filterNot(c => java.lang.reflect.Modifier.isAbstract(c.getModifiers))
       .map(modelClass => rm.reflectModule(rm.classSymbol(modelClass).companion.companion.asModule).instance)
       .collect {
-        case hasModel: HasModel[_] =>
+        case hasModel: HasModel =>
           logger.info(s"Loading model ${hasModel.model.label}")
           hasModel.model
       }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala
index bcce718a38..a94fbff6b7 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Job.scala
@@ -3,7 +3,7 @@ package org.thp.thehive.connector.cortex.models
 import java.util.Date
 
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 import org.thp.thehive.models.{Observable, RichObservable}
 import play.api.libs.json.{Format, JsObject, Json}
 
@@ -13,13 +13,13 @@ object JobStatus extends Enumeration {
   implicit val format: Format[JobStatus.Value] = Json.formatEnum(JobStatus)
 }
 
-@EdgeEntity[Observable, Job]
+@BuildEdgeEntity[Observable, Job]
 case class ObservableJob()
 
-@EdgeEntity[Job, Observable]
+@BuildEdgeEntity[Job, Observable]
 case class ReportObservable()
 
-@VertexEntity
+@BuildVertexEntity
 case class Job(
     workerId: String,
     workerName: String,
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionOperationSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionOperationSrv.scala
index 22230c7b5b..7f35beb34b 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionOperationSrv.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionOperationSrv.scala
@@ -2,16 +2,17 @@ package org.thp.thehive.connector.cortex.services
 
 import java.util.Date
 
-import gremlin.scala.Graph
 import javax.inject.Inject
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.InternalError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.models._
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputTask
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services._
 import play.api.Logger
 
@@ -77,13 +78,13 @@ class ActionOperationSrv @Inject() (
       case CloseTask() =>
         for {
           t <- relatedTask.fold[Try[Task with Entity]](Failure(InternalError("Unable to apply action CloseTask without task")))(Success(_))
-          _ <- taskSrv.get(t).update("status" -> TaskStatus.Completed)
+          _ <- taskSrv.get(t).update(_.status, TaskStatus.Completed).getOrFail("Task")
         } yield updateOperation(operation)
 
       case MarkAlertAsRead() =>
-        entity match {
-          case a: Alert => alertSrv.markAsRead(a._id).map(_ => updateOperation(operation))
-          case x        => Failure(new Exception(s"Wrong entity for MarkAlertAsRead: ${x.getClass}"))
+        entity._label match {
+          case "Alert" => alertSrv.markAsRead(entity._id).map(_ => updateOperation(operation))
+          case x       => Failure(new Exception(s"Wrong entity for MarkAlertAsRead: ${x.getClass}"))
         }
 
       case AddLogToTask(content, _) =>
@@ -109,15 +110,15 @@ class ActionOperationSrv @Inject() (
       case AssignCase(owner) =>
         for {
           c <- relatedCase.fold[Try[Case with Entity]](Failure(InternalError("Unable to apply action AssignCase without case")))(Success(_))
-          u <- userSrv.get(owner).getOrFail()
-          _ <- Try(caseSrv.initSteps.get(c._id).unassign())
+          u <- userSrv.get(owner).getOrFail("User")
+          _ <- Try(caseSrv.startTraversal.getByIds(c._id).unassign())
           _ <- caseSrv.assign(c, u)
         } yield updateOperation(operation)
 
       case AddTagToAlert(tag) =>
-        entity match {
-          case a: Alert => alertSrv.addTags(a, Set(tag)).map(_ => updateOperation(operation))
-          case x        => Failure(new Exception(s"Wrong entity for AddTagToAlert: ${x.getClass}"))
+        entity._label match {
+          case "Alert" => alertSrv.get(entity).getOrFail("Alert").flatMap(alertSrv.addTags(_, Set(tag)).map(_ => updateOperation(operation)))
+          case x       => Failure(new Exception(s"Wrong entity for AddTagToAlert: ${x.getClass}"))
         }
 
       case x =>
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionSrv.scala
index 2f612a8f16..f5f29ca018 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionSrv.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionSrv.scala
@@ -1,26 +1,32 @@
 package org.thp.thehive.connector.cortex.services
 
-import java.util.Date
+import java.util.{Date, Map => JMap}
 
 import akka.actor.ActorRef
 import com.google.inject.name.Named
-import gremlin.scala._
 import javax.inject.Inject
+import org.apache.tinkerpop.gremlin.structure.{Element, Graph}
 import org.thp.cortex.client.CortexClient
 import org.thp.cortex.dto.v0.{InputAction => CortexAction, OutputJob => CortexJob}
+import org.thp.scalligraph.NotFoundError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
-import org.thp.scalligraph.{EntitySteps, NotFoundError}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.models._
+import org.thp.thehive.connector.cortex.services.ActionOps._
 import org.thp.thehive.connector.cortex.services.Conversion._
 import org.thp.thehive.connector.cortex.services.CortexActor.CheckJob
 import org.thp.thehive.controllers.v0.Conversion._
-import org.thp.thehive.models.{Case, Task}
-import org.thp.thehive.services.{AlertSteps, CaseSteps, LogSrv, LogSteps, ObservableSteps, TaskSteps}
+import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.LogSrv
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.TaskOps._
 import play.api.libs.json.{JsObject, Json, OWrites}
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -37,12 +43,10 @@ class ActionSrv @Inject() (
     @Named("with-thehive-cortex-schema") implicit val db: Database,
     implicit val ec: ExecutionContext,
     auditSrv: CortexAuditSrv
-) extends VertexSrv[Action, ActionSteps] {
+) extends VertexSrv[Action] {
 
   val actionContextSrv = new EdgeSrv[ActionContext, Action, Product]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ActionSteps = new ActionSteps(raw)
-
   /**
     * Executes an Action on user demand,
     * creates a job on Cortex side and then persist the
@@ -52,8 +56,8 @@ class ActionSrv @Inject() (
     * @param authContext necessary auth context
     * @return
     */
-  def execute(entity: Entity, cortexId: Option[String], workerId: String, parameters: JsObject)(
-      implicit writes: OWrites[Entity],
+  def execute(entity: Product with Entity, cortexId: Option[String], workerId: String, parameters: JsObject)(implicit
+      writes: OWrites[Entity],
       authContext: AuthContext
   ): Future[RichAction] = {
     val cortexClients = serviceHelper.availableCortexClients(connector.clients, authContext.organisation)
@@ -75,7 +79,7 @@ class ActionSrv @Inject() (
         case None => Future.failed(NotFoundError(s"Responder $workerId not found"))
       }
       (label, tlp, pap) <- Future.fromTry(db.roTransaction(implicit graph => entityHelper.entityInfo(entity)))
-      inputCortexAction = CortexAction(label, writes.writes(entity), s"thehive:${fromObjectType(entity._model.label)}", tlp, pap, parameters)
+      inputCortexAction = CortexAction(label, writes.writes(entity), s"thehive:${fromObjectType(entity._label)}", tlp, pap, parameters)
       job <- client.execute(workerId, inputCortexAction)
       action = Action(
         job.workerId,
@@ -94,8 +98,8 @@ class ActionSrv @Inject() (
         db.tryTransaction { implicit graph =>
           for {
             richAction <- create(action, entity)
-            auditContext = entity._model.label match {
-              case "Log" => logSrv.get(entity).task.headOption().getOrElse(entity)
+            auditContext = entity._label match {
+              case "Log" => logSrv.get(entity).task.headOption.getOrElse(entity)
               case _     => entity
             }
             _ <- auditSrv.action.create(richAction.action, auditContext, richAction.toJson)
@@ -117,7 +121,7 @@ class ActionSrv @Inject() (
     */
   def create(
       action: Action,
-      context: Entity
+      context: Product with Entity
   )(implicit graph: Graph, authContext: AuthContext): Try[RichAction] =
     for {
       createdAction <- createEntity(action)
@@ -128,15 +132,15 @@ class ActionSrv @Inject() (
     * Once the job is finished for a precise Action,
     * updates it
     *
-    * @param actionId        the action to update
-    * @param cortexJob the result Cortex job
-    * @param authContext     context for db queries
+    * @param actionId    the action to update
+    * @param cortexJob   the result Cortex job
+    * @param authContext context for db queries
     * @return
     */
   def finished(actionId: String, cortexJob: CortexJob)(implicit authContext: AuthContext): Try[Action with Entity] =
     db.tryTransaction { implicit graph =>
-      getByIds(actionId).richAction.getOrFail().flatMap { action =>
-        val operations = cortexJob
+      getByIds(actionId).richAction.getOrFail("Action").flatMap { action =>
+        val operations: Seq[ActionOperationStatus] = cortexJob
           .report
           .fold[Seq[ActionOperation]](Nil)(_.operations.map(_.as[ActionOperation]))
           .map { operation =>
@@ -149,18 +153,17 @@ class ActionSrv @Inject() (
               )
               .fold(t => ActionOperationStatus(operation, success = false, t.getMessage), identity)
           }
-        val auditContext = action.context._model.label match {
-          case "Log" => logSrv.get(action.context).task.headOption().getOrElse(action.context)
+        val auditContext = action.context._label match {
+          case "Log" => logSrv.get(action.context).task.headOption.getOrElse(action.context)
           case _     => action.context
         }
 
         getByIds(actionId)
-          .updateOne(
-            "status"     -> cortexJob.status.toJobStatus,
-            "report"     -> cortexJob.report.map(r => Json.toJson(r.copy(operations = Nil))),
-            "endDate"    -> Some(new Date()),
-            "operations" -> operations.map(Json.toJsObject(_))
-          )
+          .update(_.status, cortexJob.status.toJobStatus)
+          .update(_.report, cortexJob.report.map(r => Json.toJsObject(r.copy(operations = Nil))))
+          .update(_.endDate, Some(new Date()))
+          .update(_.operations, operations.map(o => Json.toJsObject(o)))
+          .getOrFail("Action")
           .map { updated =>
             auditSrv
               .action
@@ -170,10 +173,11 @@ class ActionSrv @Inject() (
                 Json.obj(
                   "status"        -> updated.status.toString,
                   "objectId"      -> action.context._id,
-                  "objectType"    -> action.context._model.label,
+                  "objectType"    -> action.context._label,
                   "responderName" -> action.workerName
                 )
               )
+
             updated
           }
       }
@@ -187,67 +191,56 @@ class ActionSrv @Inject() (
     */
   def relatedCase(id: String)(implicit graph: Graph): Option[Case with Entity] =
     for {
-      richAction  <- initSteps.getByIds(id).richAction.getOrFail().toOption
+      richAction  <- startTraversal.getByIds(id).richAction.getOrFail("Action").toOption
       relatedCase <- entityHelper.parentCase(richAction.context)
     } yield relatedCase
 
   def relatedTask(id: String)(implicit graph: Graph): Option[Task with Entity] =
     for {
-      richAction  <- initSteps.getByIds(id).richAction.getOrFail().toOption
+      richAction  <- startTraversal.getByIds(id).richAction.getOrFail("Action").toOption
       relatedTask <- entityHelper.parentTask(richAction.context)
     } yield relatedTask
 
   // TODO to be tested
-  def listForEntity(id: String)(implicit graph: Graph): List[RichAction] = initSteps.forEntity(id).richAction.toList
+  def listForEntity(id: String)(implicit graph: Graph): Seq[RichAction] = startTraversal.forEntity(id).richAction.toSeq
 }
 
-@EntitySteps[Action]
-class ActionSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph, schema: Schema)
-    extends VertexSteps[Action](raw) {
+object ActionOps {
 
-  /**
-    * Provides a RichAction model with additional Entity context
-    *
-    * @return
-    */
-  def richAction: Traversal[RichAction, RichAction] =
-    Traversal(
-      raw
+  implicit class ActionOpsDefs(traversal: Traversal.V[Action]) {
+
+    /**
+      * Provides a RichAction model with additional Entity context
+      *
+      * @return
+      */
+    def richAction: Traversal[RichAction, JMap[String, Any], Converter[RichAction, JMap[String, Any]]] =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[ActionContext]))
+          _.by
+            .by(_.out[ActionContext].entity)
         )
-        .map {
+        .domainMap {
           case (action, context) =>
-            RichAction(action.as[Action], context.asEntity)
+            RichAction(action, context)
         }
-    )
 
-  def forEntity(entityId: String): ActionSteps =
-    newInstance(
-      raw.filter(
-        _.outTo[ActionContext]
-          .hasId(entityId)
+    def forEntity(entityId: String): Traversal.V[Action] =
+      traversal.filter(_.out[ActionContext].hasId(entityId))
+
+    def context: Traversal[Product with Entity, Element, Converter[Product with Entity, Element]] = traversal.out[ActionContext].entity
+
+    def visible(implicit authContext: AuthContext): Traversal.V[Action] =
+      traversal.filter(
+        _.out[ActionContext]
+          .choose(
+            _.on(_.label)
+              .option("Case", _.v[Case].visible.entity)
+              .option("Task", _.v[Task].visible.entity)
+              .option("Log", _.v[Log].visible.entity)
+              .option("Alert", _.v[Alert].visible.entity)
+              .option("Observable", _.v[Observable].visible.entity)
+          )
       )
-    )
-
-  override def newInstance(newRaw: GremlinScala[Vertex]): ActionSteps = new ActionSteps(newRaw)
-
-  def context: Traversal[Entity, Entity] = Traversal(raw.outTo[ActionContext].map(_.asEntity))
-
-  def visible(implicit authContext: AuthContext): ActionSteps = new ActionSteps(
-    raw.filter(
-      _.outTo[ActionContext]
-        .choose[Label, Vertex](
-          on = _.label(),
-          BranchCase("Case", new CaseSteps(_).visible.raw),
-          BranchCase("Task", new TaskSteps(_).visible.raw),
-          BranchCase("Log", new LogSteps(_).visible.raw),
-          BranchCase("Alert", new AlertSteps(_).visible.raw),
-          BranchCase("Observable", new ObservableSteps(_).visible.raw)
-        )
-    )
-  )
-
-  override def newInstance(): ActionSteps = new ActionSteps(raw.clone())
+  }
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/AnalyzerTemplateSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/AnalyzerTemplateSrv.scala
index ae8de64dbc..f78b33c797 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/AnalyzerTemplateSrv.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/AnalyzerTemplateSrv.scala
@@ -3,17 +3,18 @@ package org.thp.thehive.connector.cortex.services
 import java.util.zip.{ZipEntry, ZipFile}
 
 import com.google.inject.name.Named
-import gremlin.scala._
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
+import org.thp.scalligraph.CreateError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
-import org.thp.scalligraph.{CreateError, EntitySteps}
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.models.AnalyzerTemplate
+import org.thp.thehive.connector.cortex.services.AnalyzerTemplateOps._
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.services.OrganisationSrv
 import play.api.libs.json.{JsObject, Json}
@@ -27,13 +28,11 @@ class AnalyzerTemplateSrv @Inject() (
     implicit @Named("with-thehive-cortex-schema") db: Database,
     auditSrv: CortexAuditSrv,
     organisationSrv: OrganisationSrv
-) extends VertexSrv[AnalyzerTemplate, AnalyzerTemplateSteps] {
+) extends VertexSrv[AnalyzerTemplate] {
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): AnalyzerTemplateSteps = new AnalyzerTemplateSteps(raw)
-
-  override def get(idOrName: String)(implicit graph: Graph): AnalyzerTemplateSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[AnalyzerTemplate] =
     if (db.isValidId(idOrName)) getByIds(idOrName)
-    else initSteps.getByAnalyzerId(idOrName)
+    else startTraversal.getByAnalyzerId(idOrName)
 
   def readZipEntry(file: ZipFile, entry: ZipEntry): Try[String] =
     Try {
@@ -43,7 +42,7 @@ class AnalyzerTemplateSrv @Inject() (
     }
 
   def create(analyzerTemplate: AnalyzerTemplate)(implicit graph: Graph, authContext: AuthContext): Try[AnalyzerTemplate with Entity] =
-    if (initSteps.getByAnalyzerId(analyzerTemplate.workerId).exists())
+    if (startTraversal.getByAnalyzerId(analyzerTemplate.workerId).exists)
       Failure(CreateError(s"Analyzer template for ${analyzerTemplate.workerId} already exists"))
     else
       for {
@@ -52,14 +51,14 @@ class AnalyzerTemplateSrv @Inject() (
       } yield created
 
   override def update(
-      steps: AnalyzerTemplateSteps,
+      traversal: Traversal.V[AnalyzerTemplate],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(AnalyzerTemplateSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[AnalyzerTemplate], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (analyzerTemplateSteps, updatedFields) =>
         analyzerTemplateSteps
-          .newInstance()
-          .getOrFail()
+          .clone()
+          .getOrFail("AnalyzerTemplate")
           .flatMap(auditSrv.analyzerTemplate.update(_, updatedFields))
     }
 
@@ -95,7 +94,7 @@ class AnalyzerTemplateSrv @Inject() (
             .flatMap { content =>
               db.tryTransaction { implicit graph =>
                 (for {
-                  updated <- get(analyzerId).updateOne("content" -> content)
+                  updated <- get(analyzerId).update(_.content, content).getOrFail("AnalyzerTemplate")
                   _       <- auditSrv.analyzerTemplate.update(updated, Json.obj("content" -> content))
                 } yield updated).recoverWith {
                   case _ =>
@@ -110,22 +109,19 @@ class AnalyzerTemplateSrv @Inject() (
       }
 }
 
-@EntitySteps[AnalyzerTemplate]
-class AnalyzerTemplateSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-cortex-schema") db: Database, graph: Graph)
-    extends VertexSteps[AnalyzerTemplate](raw) {
-
-  def get(idOrAnalyzerId: String): AnalyzerTemplateSteps =
-    if (db.isValidId(idOrAnalyzerId)) this.getByIds(idOrAnalyzerId)
-    else getByAnalyzerId(idOrAnalyzerId)
+object AnalyzerTemplateOps {
+  implicit class AnalyzerTemplateOpsDefs(traversal: Traversal.V[AnalyzerTemplate]) {
 
-  /**
-    * Looks for a template that has the workerId supplied
-    *
-    * @param workerId the id to look for
-    * @return
-    */
-  def getByAnalyzerId(workerId: String): AnalyzerTemplateSteps = new AnalyzerTemplateSteps(raw.has(Key("workerId") of workerId))
+    def get(idOrAnalyzerId: String)(implicit db: Database): Traversal.V[AnalyzerTemplate] =
+      if (db.isValidId(idOrAnalyzerId)) traversal.getByIds(idOrAnalyzerId)
+      else getByAnalyzerId(idOrAnalyzerId)
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): AnalyzerTemplateSteps = new AnalyzerTemplateSteps(newRaw)
-  override def newInstance(): AnalyzerTemplateSteps                             = new AnalyzerTemplateSteps(raw.clone())
+    /**
+      * Looks for a template that has the workerId supplied
+      *
+      * @param workerId the id to look for
+      * @return
+      */
+    def getByAnalyzerId(workerId: String): Traversal.V[AnalyzerTemplate] = traversal.has("workerId", workerId).v[AnalyzerTemplate]
+  }
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/CortexAuditSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/CortexAuditSrv.scala
index 09fe88027c..4aa4767c55 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/CortexAuditSrv.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/CortexAuditSrv.scala
@@ -19,7 +19,7 @@ class CortexAuditSrv @Inject() (
     extends AuditSrv(userSrvProvider, notificationActor, eventSrv) {
 
   val job              = new ObjectAudit[Job, Observable]
-  val action           = new ObjectAudit[Action, Entity]
+  val action           = new ObjectAudit[Action, Product with Entity]
   val analyzerTemplate = new SelfContextObjectAudit[AnalyzerTemplate]
 
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/EntityHelper.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/EntityHelper.scala
index a0cc00f82b..e0133deca7 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/EntityHelper.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/EntityHelper.scala
@@ -1,12 +1,17 @@
 package org.thp.thehive.connector.cortex.services
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.BadRequestError
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services._
 import play.api.Logger
 
@@ -33,13 +38,13 @@ class EntityHelper @Inject() (
     * @param authContext auth for permission check
     * @return
     */
-  def get(objectType: String, objectId: String, permission: Permission)(implicit graph: Graph, authContext: AuthContext): Try[Entity] =
+  def get(objectType: String, objectId: String, permission: Permission)(implicit graph: Graph, authContext: AuthContext): Try[Product with Entity] =
     objectType match {
-      case "Task"       => taskSrv.getByIds(objectId).can(permission).getOrFail()
-      case "Case"       => caseSrv.get(objectId).can(permission).getOrFail()
-      case "Observable" => observableSrv.getByIds(objectId).can(permission).getOrFail()
-      case "Log"        => logSrv.getByIds(objectId).can(permission).getOrFail()
-      case "Alert"      => alertSrv.getByIds(objectId).can(permission).getOrFail()
+      case "Task"       => taskSrv.getByIds(objectId).can(permission).getOrFail("Task")
+      case "Case"       => caseSrv.get(objectId).can(permission).getOrFail("Case")
+      case "Observable" => observableSrv.getByIds(objectId).can(permission).getOrFail("Observable")
+      case "Log"        => logSrv.getByIds(objectId).can(permission).getOrFail("Log")
+      case "Alert"      => alertSrv.getByIds(objectId).can(permission).getOrFail("Alert")
       case _            => Failure(BadRequestError(s"objectType $objectType is not recognised"))
     }
 
@@ -49,13 +54,14 @@ class EntityHelper @Inject() (
     * @param graph db traversal
     * @return
     */
-  def parentCase(entity: Entity)(implicit graph: Graph): Option[Case with Entity] = entity match {
-    case t: Task  => taskSrv.get(t).`case`.headOption()
-    case c: Case  => Some(c)
-    case l: Log   => logSrv.get(l).`case`.headOption()
-    case _: Alert => None
-    case _        => None
-  }
+  def parentCase(entity: Entity)(implicit graph: Graph): Option[Case with Entity] =
+    entity._label match {
+      case "Task"  => taskSrv.get(entity).`case`.headOption
+      case "Case"  => caseSrv.get(entity).headOption
+      case "Log"   => logSrv.get(entity).`case`.headOption
+      case "Alert" => None
+      case _       => None
+    }
 
   /**
     * Retrieves an optional parent Task
@@ -63,10 +69,11 @@ class EntityHelper @Inject() (
     * @param graph db traversal
     * @return
     */
-  def parentTask(entity: Entity)(implicit graph: Graph): Option[Task with Entity] = entity match {
-    case l: Log => logSrv.get(l).task.headOption()
-    case _      => None
-  }
+  def parentTask(entity: Entity)(implicit graph: Graph): Option[Task with Entity] =
+    entity._label match {
+      case "Log" => logSrv.get(entity).task.headOption
+      case _     => None
+    }
 
   /**
     * Tries to fetch the tlp and pap associated to the supplied entity
@@ -78,14 +85,14 @@ class EntityHelper @Inject() (
     */
   def entityInfo(entity: Entity)(implicit graph: Graph, authContext: AuthContext): Try[(String, Int, Int)] =
     entity match {
-      case t: Task  => taskSrv.get(t).visible.`case`.getOrFail().map(c => (s"${t.title} (${t.status})", c.tlp, c.pap))
-      case c: Case  => caseSrv.get(c).visible.getOrFail().map(c => (s"#${c.number} ${c.title}", c.tlp, c.pap))
-      case l: Log   => logSrv.get(l).visible.`case`.getOrFail().map(c => (s"${l.message} from ${l._createdBy}", c.tlp, c.pap))
-      case a: Alert => alertSrv.get(a).visible.getOrFail().map(a => (s"[${a.source}:${a.sourceRef}] ${a.title}", a.tlp, a.pap))
+      case t: Task  => taskSrv.get(t).visible.`case`.getOrFail("Case").map(c => (s"${t.title} (${t.status})", c.tlp, c.pap))
+      case c: Case  => caseSrv.get(c).visible.getOrFail("Case").map(c => (s"#${c.number} ${c.title}", c.tlp, c.pap))
+      case l: Log   => logSrv.get(l).visible.`case`.getOrFail("Case").map(c => (s"${l.message} from ${l._createdBy}", c.tlp, c.pap))
+      case a: Alert => alertSrv.get(a).visible.getOrFail("Alert").map(a => (s"[${a.source}:${a.sourceRef}] ${a.title}", a.tlp, a.pap))
       case o: Observable =>
         for {
-          ro <- observableSrv.get(o).visible.richObservable.getOrFail()
-          c  <- observableSrv.get(o).`case`.getOrFail()
+          ro <- observableSrv.get(o).visible.richObservable.getOrFail("Observable")
+          c  <- observableSrv.get(o).`case`.getOrFail("Case")
         } yield (s"[${ro.`type`.name}] ${ro.data.map(_.data).getOrElse("<no data>")}", ro.tlp, c.pap) // TODO add attachment info
     }
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala
index b755bb3ee2..9ca07d3afa 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/JobSrv.scala
@@ -1,35 +1,38 @@
 package org.thp.thehive.connector.cortex.services
 
 import java.nio.file.Files
-import java.util.Date
+import java.util.{Date, Map => JMap}
 
 import akka.Done
 import akka.actor._
 import akka.stream.Materializer
 import akka.stream.scaladsl.FileIO
 import com.google.inject.name.Named
-import gremlin.scala._
 import io.scalaland.chimney.dsl._
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.process.traversal.P
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.cortex.client.CortexClient
 import org.thp.cortex.dto.v0.{InputArtifact, OutputArtifact, Attachment => CortexAttachment, OutputJob => CortexJob}
+import org.thp.scalligraph.NotFoundError
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
-import org.thp.scalligraph.{EntitySteps, NotFoundError}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.models._
 import org.thp.thehive.connector.cortex.services.Conversion._
 import org.thp.thehive.connector.cortex.services.CortexActor.CheckJob
+import org.thp.thehive.connector.cortex.services.JobOps._
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.models._
-import org.thp.thehive.services.{AttachmentSrv, ObservableSrv, ObservableSteps, ObservableTypeSrv, ReportTagSrv}
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.{AttachmentSrv, ObservableSrv, ObservableTypeSrv, ReportTagSrv}
 import play.api.libs.json.Json
 
-import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success, Try}
 
@@ -46,13 +49,11 @@ class JobSrv @Inject() (
     @Named("with-thehive-schema") implicit val db: Database,
     implicit val ec: ExecutionContext,
     implicit val mat: Materializer
-) extends VertexSrv[Job, JobSteps] {
+) extends VertexSrv[Job] {
 
   val observableJobSrv    = new EdgeSrv[ObservableJob, Observable, Job]
   val reportObservableSrv = new EdgeSrv[ReportObservable, Job, Observable]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): JobSteps = new JobSteps(raw)
-
   /**
     * Submits an observable for analysis to cortex client and stores
     * resulting job and send the cortex reference id to the polling job status actor
@@ -162,12 +163,12 @@ class JobSrv @Inject() (
         val status  = cortexJob.status.toJobStatus
         val endDate = new Date()
         for {
-          job <- get(job).updateOne(
-            "report"  -> report,
-            "status"  -> status,
-            "endDate" -> endDate
-          )
-          observable <- get(job).observable.getOrFail()
+          job <- get(job)
+            .update(_.report, report)
+            .update(_.status, status)
+            .update(_.endDate, endDate)
+            .getOrFail("Job")
+          observable <- get(job).observable.getOrFail("Observable")
           _          <- auditSrv.job.update(job, observable, Json.obj("status" -> status, "endDate" -> endDate))
         } yield job
       }
@@ -177,7 +178,7 @@ class JobSrv @Inject() (
     db.tryTransaction { implicit graph =>
       val tags = cortexJob.report.fold[Seq[ReportTag]](Nil)(_.summary.map(_.toAnalyzerTag(job.workerName)))
       for {
-        observable <- get(job).observable.getOrFail()
+        observable <- get(job).observable.getOrFail("Observable")
         _          <- reportTagSrv.updateTags(observable, job.workerName, tags)
       } yield ()
     }
@@ -265,101 +266,106 @@ class JobSrv @Inject() (
 
 }
 
-@EntitySteps[Job]
-class JobSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Job](raw) {
+object JobOps {
 
-  /**
-    * Checks if a Job is visible from a certain UserRole end
-    *
-    * @param authContext the auth context to check login against
-    * @return
-    */
-  def visible(implicit authContext: AuthContext): JobSteps =
-    this.filter(
-      _.inTo[ObservableJob]
-        .inTo[ShareObservable]
-        .inTo[OrganisationShare]
-        .has("name", authContext.organisation)
-    )
+  implicit class JobOpsDefs(traversal: Traversal.V[Job]) {
 
-  /**
-    * Checks if a job is accessible if the user and
-    * the share profile contain the permission
-    * @param permission the permission to check
-    * @param authContext the user context
-    * @return
-    */
-  def can(permission: Permission)(implicit authContext: AuthContext): JobSteps =
-    if (authContext.permissions.contains(permission))
-      this.filter(
-        _.inTo[ObservableJob]
-          .inTo[ShareObservable]
-          .filter(_.outTo[ShareProfile].has("permissions", permission))
-          .inTo[OrganisationShare]
+    /**
+      * Checks if a Job is visible from a certain UserRole end
+      *
+      * @param authContext the auth context to check login against
+      * @return
+      */
+    def visible(implicit authContext: AuthContext): Traversal.V[Job] =
+      traversal.filter(
+        _.in[ObservableJob]
+          .in[ShareObservable]
+          .in[OrganisationShare]
           .has("name", authContext.organisation)
       )
-    else this.limit(0)
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): JobSteps = new JobSteps(newRaw)
-  override def newInstance(): JobSteps                             = new JobSteps(raw.clone())
+    /**
+      * Checks if a job is accessible if the user and
+      * the share profile contain the permission
+      *
+      * @param permission  the permission to check
+      * @param authContext the user context
+      * @return
+      */
+    def can(permission: Permission)(implicit authContext: AuthContext): Traversal.V[Job] =
+      if (authContext.permissions.contains(permission))
+        traversal.filter(
+          _.in[ObservableJob]
+            .in[ShareObservable]
+            .filter(_.out[ShareProfile].has("permissions", permission))
+            .in[OrganisationShare]
+            .has("name", authContext.organisation)
+        )
+      else traversal.limit(0)
 
-  def observable: ObservableSteps = new ObservableSteps(raw.inTo[ObservableJob])
+    def observable: Traversal.V[Observable] = traversal.in[ObservableJob].v[Observable]
 
-  /**
-    * Returns the potential observables that were attached to a job report
-    * after analyze has completed
-    *
-    * @return
-    */
-  def reportObservables: ObservableSteps = new ObservableSteps(raw.outTo[ReportObservable])
+    /**
+      * Returns the potential observables that were attached to a job report
+      * after analyze has completed
+      *
+      * @return
+      */
+    def reportObservables: Traversal.V[Observable] = traversal.out[ReportObservable].v[Observable]
 
-  def richJob(implicit authContext: AuthContext): Traversal[RichJob, RichJob] = {
-    val thisJob = StepLabel()
-    this
-      .as(thisJob)
-      .project(
-        _.by
-          .by(
-            _.reportObservables
-              .project(
-                _.by(_.richObservable)
-                  .by(_.similar.filter(_.`case`.observables.outTo[ObservableJob].where(P.eq[String](thisJob.name)))._id.fold)
-              )
-              .fold
-          )
-      )
-      .map {
-        case (job, observablesWithLink) =>
-          val observables = observablesWithLink.asScala.map {
-            case (obs, l) => obs -> Json.obj("observableId" -> l.asScala.headOption.map(_.toString))
-          }
-          RichJob(job.as[Job], observables)
-      }
+    def richJob(implicit authContext: AuthContext) = {
+      val thisJob = StepLabel.v[Job]
+      traversal
+        .as(thisJob)
+        .project(
+          _.by
+            .by(
+              _.reportObservables
+                .project(
+                  _.by(_.richObservable)
+                    .by(_.similar.filter(_.`case`.observables.out[ObservableJob].where(P.eq[String](thisJob.name)))._id.fold)
+                )
+                .fold
+            )
+        )
+        .domainMap {
+          case (job, observablesWithLink) =>
+            val observables = observablesWithLink.map {
+              case (obs, l) => obs -> Json.obj("observableId" -> l)
+            }
+            RichJob(job, observables)
+        }
+    }
+
+    def richJobWithCustomRenderer[D, G, C <: Converter[D, G]](
+        entityRenderer: Traversal.V[Job] => Traversal[D, G, C]
+    )(implicit authContext: AuthContext): Traversal[(RichJob, D), JMap[String, Any], Converter[(RichJob, D), JMap[String, Any]]] = {
+      val thisJob = StepLabel.v[Job]
+      traversal
+        .as(thisJob)
+        .project(
+          _.by
+            .by(
+              _.reportObservables
+                .project(
+                  _.by(_.richObservable)
+                    .by(_.similar.filter(_.`case`.observables.out[ObservableJob].where(P.eq[String](thisJob.name)))._id.fold)
+                )
+                .fold
+            )
+            .by(entityRenderer)
+        )
+        .domainMap {
+          case (job, observablesWithLink, renderedEntity) =>
+            val observables = observablesWithLink.map {
+              case (obs, l) => obs -> Json.obj("observableId" -> l)
+            }
+            RichJob(job, observables) -> renderedEntity
+        }
+    }
   }
-  def richJobWithCustomRenderer[A](
-      entityRenderer: JobSteps => TraversalLike[_, A]
-  )(implicit authContext: AuthContext): Traversal[(RichJob, A), (RichJob, A)] = {
-    val thisJob = StepLabel()
-    this
-      .as(thisJob)
-      .project(
-        _.by
-          .by(
-            _.reportObservables
-              .project(
-                _.by(_.richObservable)
-                  .by(_.similar.filter(_.`case`.observables.outTo[ObservableJob].where(P.eq[String](thisJob.name)))._id.fold)
-              )
-              .fold
-          )
-          .by(entityRenderer)
-      )
-      .map {
-        case (job, observablesWithLink, renderedEntity) =>
-          val observables = observablesWithLink.asScala.map {
-            case (obs, l) => obs -> Json.obj("observableId" -> l.asScala.headOption.map(_.toString))
-          }
-          RichJob(job.as[Job], observables) -> renderedEntity
-      }
+  implicit class CortexObservableOpsDefs(traversal: Traversal.V[Observable]) {
+    def jobs: Traversal.V[Job] = traversal.out[ObservableJob].v[Job]
   }
+
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ServiceHelper.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ServiceHelper.scala
index 9294749673..15b77720ce 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ServiceHelper.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/ServiceHelper.scala
@@ -1,12 +1,14 @@
 package org.thp.thehive.connector.cortex.services
 
 import com.google.inject.name.Named
-import gremlin.scala.P
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.process.traversal.P
 import org.thp.cortex.client.CortexClient
 import org.thp.cortex.dto.v0.OutputWorker
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.models.Organisation
 import org.thp.thehive.services._
 import play.api.Logger
 
@@ -28,7 +30,7 @@ class ServiceHelper @Inject() (
     val l = clients
       .filter(c =>
         organisationFilter(
-          organisationSrv.initSteps,
+          organisationSrv.startTraversal,
           c.includedTheHiveOrganisations,
           c.excludedTheHiveOrganisations
         ).toList
@@ -51,10 +53,10 @@ class ServiceHelper @Inject() (
     * @return
     */
   def organisationFilter(
-      organisationSteps: OrganisationSteps,
+      organisationSteps: Traversal.V[Organisation],
       includedTheHiveOrganisations: Seq[String],
       excludedTheHiveOrganisations: Seq[String]
-  ): OrganisationSteps = {
+  ): Traversal.V[Organisation] = {
     val includedOrgs =
       if (includedTheHiveOrganisations.contains("*") || includedTheHiveOrganisations.isEmpty) organisationSteps
       else organisationSteps.has("name", P.within(includedTheHiveOrganisations))
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/package.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/package.scala
deleted file mode 100644
index e397955856..0000000000
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/package.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.thp.thehive.connector.cortex
-
-import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.connector.cortex.models.ObservableJob
-import org.thp.thehive.services.ObservableSteps
-
-package object services {
-  implicit class RichObservableSteps(observableSteps: ObservableSteps) {
-    def jobs: JobSteps =
-      new JobSteps(observableSteps.outTo[ObservableJob].raw)(observableSteps.db.asInstanceOf[Database], observableSteps.graph)
-  }
-}
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerCtrlTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerCtrlTest.scala
index f8bcb5c265..d4ba90febb 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerCtrlTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerCtrlTest.scala
@@ -2,8 +2,8 @@ package org.thp.thehive.connector.cortex.controllers.v0
 
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.models.Database
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import org.thp.thehive.connector.cortex.dto.v0.OutputWorker
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.test.{FakeRequest, PlaySpecification}
 
 class AnalyzerCtrlTest extends PlaySpecification with TestAppBuilder {
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrlTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrlTest.scala
index 7705b5d9aa..1abf23b16f 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrlTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerTemplateCtrlTest.scala
@@ -3,8 +3,8 @@ package org.thp.thehive.connector.cortex.controllers.v0
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.controllers.FakeTemporaryFile
 import org.thp.scalligraph.models.Database
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import org.thp.thehive.connector.cortex.dto.v0.OutputAnalyzerTemplate
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.libs.json.Json
 import play.api.mvc.MultipartFormData.FilePart
 import play.api.mvc.{AnyContentAsMultipartFormData, MultipartFormData}
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrlTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrlTest.scala
index 2915c07e0b..d7183384c8 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrlTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/controllers/v0/JobCtrlTest.scala
@@ -3,11 +3,11 @@ package org.thp.thehive.connector.cortex.controllers.v0
 import org.thp.cortex.client.{CortexClient, TestCortexClientProvider}
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.models.{Database, Schema}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.models.TheHiveCortexSchemaProvider
 import org.thp.thehive.connector.cortex.services.{Connector, CortexActor, TestConnector}
 import org.thp.thehive.services.ObservableSrv
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.libs.json.Json
 import play.api.test.{FakeRequest, PlaySpecification}
 
@@ -28,7 +28,7 @@ class JobCtrlTest extends PlaySpecification with TestAppBuilder {
   "job controller" should {
     "get a job" in testApp { app =>
       val observable = app[Database].roTransaction { implicit graph =>
-        app[ObservableSrv].initSteps.has("message", "Some weird domain").getOrFail("Observable").get
+        app[ObservableSrv].startTraversal.has("message", "Some weird domain").getOrFail("Observable").get
       }
 
       val requestSearch = FakeRequest("POST", s"/api/connector/cortex/job/_search?range=0-200&sort=-startDate")
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ActionSrvTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ActionSrvTest.scala
index db2dde50e2..6edb69076b 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ActionSrvTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ActionSrvTest.scala
@@ -5,12 +5,14 @@ import org.thp.cortex.dto.v0.OutputJob
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.controllers.v0.ActionCtrl
 import org.thp.thehive.connector.cortex.models.{JobStatus, TheHiveCortexSchemaProvider}
 import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services.{AlertSrv, LogSrv, TaskSrv}
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.libs.json._
 import play.api.test.PlaySpecification
 
@@ -49,7 +51,7 @@ class ActionSrvTest extends PlaySpecification with TestAppBuilder {
     "execute, create and handle finished action operations" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
         implicit val entityWrites: OWrites[Entity] = app[ActionCtrl].entityWrites
-        val task1: Task with Entity                = app[TaskSrv].initSteps.has("title", "case 1 task 1").head()
+        val task1: Task with Entity                = app[TaskSrv].startTraversal.has("title", "case 1 task 1").head
 
         val richAction = await(app[ActionSrv].execute(task1, None, "respTest1", JsObject.empty))
         richAction.workerId shouldEqual "respTest1"
@@ -75,7 +77,7 @@ class ActionSrvTest extends PlaySpecification with TestAppBuilder {
     "handle action related to Task and Log" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
         implicit val entityWrites: OWrites[Entity] = app[ActionCtrl].entityWrites
-        val log1                                   = app[LogSrv].initSteps.has("message", "log for action test").head()
+        val log1                                   = app[LogSrv].startTraversal.has("message", "log for action test").head
 
         val richAction = await(app[ActionSrv].execute(log1, None, "respTest1", JsObject.empty))
         richAction.workerId shouldEqual "respTest1"
@@ -99,15 +101,15 @@ class ActionSrvTest extends PlaySpecification with TestAppBuilder {
       }
 
       app[Database].roTransaction { implicit graph =>
-        app[TaskSrv].initSteps.has("title", "case 2 task 2").has("status", "Completed").exists() must beTrue
-        app[TaskSrv].initSteps.has("title", "case 2 task 2").logs.has("message", "test log from action").exists() must beTrue
+        app[TaskSrv].startTraversal.has("title", "case 2 task 2").has("status", "Completed").exists must beTrue
+        app[TaskSrv].startTraversal.has("title", "case 2 task 2").logs.has("message", "test log from action").exists must beTrue
       }
     }
 
     "handle action related to an Alert" in testApp { app =>
       implicit val entityWrites: OWrites[Entity] = app[ActionCtrl].entityWrites
       val alert = app[Database].roTransaction { implicit graph =>
-        app[AlertSrv].get("testType;testSource;ref2").visible.head()
+        app[AlertSrv].get("testType;testSource;ref2").visible.head
       }
       alert.read must beFalse
       val richAction = await(app[ActionSrv].execute(alert, None, "respTest1", JsObject.empty))
@@ -120,7 +122,7 @@ class ActionSrvTest extends PlaySpecification with TestAppBuilder {
       updatedActionTry must beSuccessfulTry
 
       app[Database].roTransaction { implicit graph =>
-        val updatedAlert = app[AlertSrv].get("testType;testSource;ref2").visible.richAlert.head() // FIXME
+        val updatedAlert = app[AlertSrv].get("testType;testSource;ref2").visible.richAlert.head // FIXME
         updatedAlert.read must beTrue
         updatedAlert.tags.map(_.toString) must contain("test tag from action") // TODO
       }
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/AnalyzerSrvTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/AnalyzerSrvTest.scala
index df6110b615..43fd62587d 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/AnalyzerSrvTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/AnalyzerSrvTest.scala
@@ -5,9 +5,9 @@ import org.thp.cortex.dto.v0.OutputWorker
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import org.thp.thehive.connector.cortex.models.TheHiveCortexSchemaProvider
 import org.thp.thehive.models.Permissions
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.test.PlaySpecification
 
 class AnalyzerSrvTest extends PlaySpecification with TestAppBuilder {
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/EntityHelperTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/EntityHelperTest.scala
index fe1c06a98e..5c78531e68 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/EntityHelperTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/EntityHelperTest.scala
@@ -2,9 +2,10 @@ package org.thp.thehive.connector.cortex.services
 
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models.Permissions
+import org.thp.thehive.services.AlertOps._
 import org.thp.thehive.services.{AlertSrv, ObservableSrv, TaskSrv}
 import play.api.test.PlaySpecification
 
@@ -16,7 +17,7 @@ class EntityHelperTest extends PlaySpecification with TestAppBuilder {
     "return task info" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
         for {
-          task              <- app[TaskSrv].initSteps.has("title", "case 1 task 1").getOrFail("Task")
+          task              <- app[TaskSrv].startTraversal.has("title", "case 1 task 1").getOrFail("Task")
           (title, tlp, pap) <- app[EntityHelper].entityInfo(task)
         } yield (title, tlp, pap)
       } must beASuccessfulTry.which {
@@ -30,7 +31,7 @@ class EntityHelperTest extends PlaySpecification with TestAppBuilder {
     "return observable info" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
         for {
-          observable        <- app[ObservableSrv].initSteps.has("message", "Some weird domain").getOrFail("Observable")
+          observable        <- app[ObservableSrv].startTraversal.has("message", "Some weird domain").getOrFail("Observable")
           (title, tlp, pap) <- app[EntityHelper].entityInfo(observable)
         } yield (title, tlp, pap)
       } must beASuccessfulTry.which {
@@ -44,7 +45,7 @@ class EntityHelperTest extends PlaySpecification with TestAppBuilder {
     "find a manageable entity only (task)" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
         for {
-          task <- app[TaskSrv].initSteps.has("title", "case 1 task 1").getOrFail("Task")
+          task <- app[TaskSrv].startTraversal.has("title", "case 1 task 1").getOrFail("Task")
           t    <- app[EntityHelper].get("Task", task._id, Permissions.manageAction)
         } yield t
       } must beSuccessfulTry
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/JobSrvTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/JobSrvTest.scala
index 78c4ef318c..45e886592f 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/JobSrvTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/JobSrvTest.scala
@@ -7,12 +7,15 @@ import org.thp.cortex.dto.v0.OutputJob
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, DummyUserSrv, Schema}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.models.{Job, JobStatus, TheHiveCortexSchemaProvider}
+import org.thp.thehive.connector.cortex.services.JobOps._
 import org.thp.thehive.models.Permissions
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import org.thp.thehive.services.notification.triggers.JobFinished
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.libs.json.Json
 import play.api.test.PlaySpecification
 
@@ -54,7 +57,7 @@ class JobSrvTest extends PlaySpecification with TestAppBuilder {
 
       val createdJobTry = app[Database].tryTransaction { implicit graph =>
         for {
-          observable <- app[ObservableSrv].initSteps.has("message", "hello world").getOrFail("Observable")
+          observable <- app[ObservableSrv].startTraversal.has("message", "hello world").getOrFail("Observable")
           createdJob <- app[JobSrv].create(job, observable)
         } yield createdJob
       }
@@ -66,15 +69,15 @@ class JobSrvTest extends PlaySpecification with TestAppBuilder {
         (updatedJob.report.get \ "data").as[String] shouldEqual "imageedit_2_3904987689.jpg"
 
         app[Database].roTransaction { implicit graph =>
-          app[JobSrv].get(updatedJob).observable.has("message", "hello world").exists() must beTrue
+          app[JobSrv].get(updatedJob).observable.has("message", "hello world").exists must beTrue
           app[JobSrv].get(updatedJob).reportObservables.toList.length must equalTo(2).updateMessage { s =>
             s"$s\nreport observables are : ${app[JobSrv].get(updatedJob).reportObservables.richObservable.toList.mkString("\n")}"
           }
 
           for {
-            audit        <- app[AuditSrv].initSteps.has("objectId", updatedJob._id).getOrFail("Audit")
+            audit        <- app[AuditSrv].startTraversal.has("objectId", updatedJob._id).getOrFail("Audit")
             organisation <- app[OrganisationSrv].get("cert").getOrFail("Organisation")
-            user         <- app[UserSrv].initSteps.getByName("certuser@thehive.local").getOrFail("User")
+            user         <- app[UserSrv].startTraversal.getByName("certuser@thehive.local").getOrFail("User")
           } yield new JobFinished().filter(audit, Some(updatedJob), organisation, Some(user))
         } must beASuccessfulTry(true)
       }
@@ -83,7 +86,7 @@ class JobSrvTest extends PlaySpecification with TestAppBuilder {
     "submit a job" in testApp { app =>
       val x = for {
         observable <- app[Database].roTransaction { implicit graph =>
-          app[ObservableSrv].initSteps.has("message", "Some weird domain").richObservable.getOrFail("Observable")
+          app[ObservableSrv].startTraversal.has("message", "Some weird domain").richObservable.getOrFail("Observable")
         }
         case0 <- app[Database].roTransaction { implicit graph =>
           app[CaseSrv].getOrFail("#1")
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ResponderSrvTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ResponderSrvTest.scala
index e084a48e64..e2f280cca5 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ResponderSrvTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ResponderSrvTest.scala
@@ -4,11 +4,11 @@ import org.thp.cortex.client.{CortexClient, TestCortexClientProvider}
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.models.TheHiveCortexSchemaProvider
 import org.thp.thehive.models.Permissions
 import org.thp.thehive.services._
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.libs.json.Json
 import play.api.test.PlaySpecification
 
@@ -32,7 +32,7 @@ class ResponderSrvTest extends PlaySpecification with TestAppBuilder {
   "responder service" should {
     "fetch responders by type" in testApp { app =>
       val task = app[Database].roTransaction { implicit graph =>
-        app[TaskSrv].initSteps.has("title", "case 1 task 1").head()
+        app[TaskSrv].startTraversal.has("title", "case 1 task 1").head
       }
 
       val r = await(app[ResponderSrv].getRespondersByType("case_task", task._id))
diff --git a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ServiceHelperTest.scala b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ServiceHelperTest.scala
index b290957ff4..1891d571de 100644
--- a/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ServiceHelperTest.scala
+++ b/cortex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/ServiceHelperTest.scala
@@ -3,11 +3,11 @@ package org.thp.thehive.connector.cortex.services
 import org.thp.cortex.client.{CortexClient, TestCortexClientProvider}
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.models.{Database, Schema}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.models.TheHiveCortexSchemaProvider
 import org.thp.thehive.models.Organisation
 import org.thp.thehive.services._
+import org.thp.thehive.{BasicDatabaseProvider, TestAppBuilder}
 import play.api.test.PlaySpecification
 
 class ServiceHelperTest extends PlaySpecification with TestAppBuilder {
@@ -29,7 +29,7 @@ class ServiceHelperTest extends PlaySpecification with TestAppBuilder {
       val r = app[Database].roTransaction { implicit graph =>
         app[ServiceHelper]
           .organisationFilter(
-            app.apply[OrganisationSrv].initSteps,
+            app.apply[OrganisationSrv].startTraversal,
             List("*"),
             List("cert")
           )
@@ -40,7 +40,7 @@ class ServiceHelperTest extends PlaySpecification with TestAppBuilder {
       val r2 = app[Database].roTransaction { implicit graph =>
         app[ServiceHelper]
           .organisationFilter(
-            app.apply[OrganisationSrv].initSteps,
+            app.apply[OrganisationSrv].startTraversal,
             Nil,
             Nil
           )
diff --git a/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Job.scala b/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Job.scala
index df80e245c6..e2a906628c 100644
--- a/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Job.scala
+++ b/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Job.scala
@@ -78,7 +78,7 @@ case class OutputReport(
 )
 
 object OutputReport {
-  implicit val writes: Writes[OutputReport] = Writes[OutputReport] { outputReport =>
+  implicit val writes: OWrites[OutputReport] = OWrites[OutputReport] { outputReport =>
     Json.obj(
       "summary"      -> Json.obj("taxonomies" -> Json.toJson(outputReport.summary)),
       "full"         -> Json.toJson(outputReport.full),
diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/Audit.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/Audit.scala
index 8b35fa228c..c8391d8242 100644
--- a/dto/src/main/scala/org/thp/thehive/dto/v0/Audit.scala
+++ b/dto/src/main/scala/org/thp/thehive/dto/v0/Audit.scala
@@ -11,7 +11,7 @@ object OutputEntity {
   implicit val format: OFormat[OutputEntity] = Json.format[OutputEntity]
 
   def apply(e: Entity): OutputEntity = OutputEntity(
-    e._model.label,
+    e._label,
     e._id,
     e._createdAt,
     e._createdBy,
diff --git a/dto/src/main/scala/org/thp/thehive/dto/v1/Audit.scala b/dto/src/main/scala/org/thp/thehive/dto/v1/Audit.scala
index 9c08cd20f3..1a32e9c06b 100644
--- a/dto/src/main/scala/org/thp/thehive/dto/v1/Audit.scala
+++ b/dto/src/main/scala/org/thp/thehive/dto/v1/Audit.scala
@@ -11,7 +11,7 @@ object OutputEntity {
   implicit val format: OFormat[OutputEntity] = Json.format[OutputEntity]
 
   def apply(e: Entity): OutputEntity = OutputEntity(
-    e._model.label,
+    e._label,
     e._id,
     e._createdAt,
     e._createdBy,
diff --git a/dto/src/main/scala/org/thp/thehive/dto/v1/Case.scala b/dto/src/main/scala/org/thp/thehive/dto/v1/Case.scala
index ee4f8554d7..f4a75c1c04 100644
--- a/dto/src/main/scala/org/thp/thehive/dto/v1/Case.scala
+++ b/dto/src/main/scala/org/thp/thehive/dto/v1/Case.scala
@@ -3,7 +3,7 @@ package org.thp.thehive.dto.v1
 import java.util.Date
 
 import org.thp.scalligraph.controllers.WithParser
-import play.api.libs.json.{JsObject, Json, OFormat, OWrites, Reads}
+import play.api.libs.json._
 
 case class InputCase(
     title: String,
diff --git a/migration/src/main/scala/org/thp/thehive/migration/MigrationOps.scala b/migration/src/main/scala/org/thp/thehive/migration/MigrationOps.scala
index 2f329a67e1..47f8f173e3 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/MigrationOps.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/MigrationOps.scala
@@ -122,7 +122,7 @@ trait MigrationOps {
   lazy val logger: Logger            = Logger(getClass)
   val migrationStats: MigrationStats = new MigrationStats
 
-  implicit class IdMappingOps(idMappings: Seq[IdMapping]) {
+  implicit class IdMappingOpsDefs(idMappings: Seq[IdMapping]) {
 
     def fromInput(id: String): Try[String] =
       idMappings
diff --git a/migration/src/main/scala/org/thp/thehive/migration/Terminal.scala b/migration/src/main/scala/org/thp/thehive/migration/Terminal.scala
index 073523d4d1..766ba4306a 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/Terminal.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/Terminal.scala
@@ -2,7 +2,7 @@ package org.thp.thehive.migration
 import java.io.{File, OutputStreamWriter, Writer}
 
 class Terminal(output: Writer) {
-  lazy val pathedTput: String = if (new File("/usr/bin/tput").exists()) "/usr/bin/tput" else "tput"
+  lazy val pathedTput: String = if (new File("/usr/bin/tput").exists) "/usr/bin/tput" else "tput"
 
   def consoleDim(s: String): Int = {
     import sys.process._
@@ -60,7 +60,7 @@ object Terminal {
   // Prefer standard tools. Not sure why we need to do this, but for some
   // reason the version installed by gnu-coreutils blows up sometimes giving
   // "unable to perform all requested operations"
-  lazy val pathedStty: String = if (new File("/bin/stty").exists()) "/bin/stty" else "stty"
+  lazy val pathedStty: String = if (new File("/bin/stty").exists) "/bin/stty" else "stty"
 
   def apply[A](body: Terminal => A): A = {
     stty("-a")
diff --git a/migration/src/main/scala/org/thp/thehive/migration/th4/NoAuditSrv.scala b/migration/src/main/scala/org/thp/thehive/migration/th4/NoAuditSrv.scala
index 237428ae57..0ec7681f11 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/th4/NoAuditSrv.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/th4/NoAuditSrv.scala
@@ -2,8 +2,8 @@ package org.thp.thehive.migration.th4
 
 import akka.actor.ActorRef
 import com.google.inject.name.Named
-import gremlin.scala.Graph
 import javax.inject.{Inject, Provider, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.EventSrv
@@ -20,7 +20,10 @@ class NoAuditSrv @Inject() (
 )(implicit @Named("with-thehive-schema") db: Database)
     extends AuditSrv(userSrvProvider, notificationActor, eventSrv)(db) {
 
-  override def create(audit: Audit, context: Option[Entity], `object`: Option[Entity])(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
+  override def create(audit: Audit, context: Option[Product with Entity], `object`: Option[Product with Entity])(
+      implicit graph: Graph,
+      authContext: AuthContext
+  ): Try[Unit] =
     Success(())
 
   override def mergeAudits[R](body: => Try[R])(auditCreator: R => Try[Unit])(implicit graph: Graph): Try[R] = body
diff --git a/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala b/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
index d233e2db5f..bb203d570b 100644
--- a/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
+++ b/migration/src/main/scala/org/thp/thehive/migration/th4/Output.scala
@@ -1,46 +1,26 @@
 package org.thp.thehive.migration.th4
 
-import java.util.Date
-
 import akka.actor.ActorSystem
 import akka.stream.Materializer
 import com.google.inject.Guice
-import gremlin.scala._
 import javax.inject.{Inject, Named, Provider, Singleton}
 import net.codingwell.scalaguice.ScalaModule
+import org.apache.tinkerpop.gremlin.process.traversal.P
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph._
 import org.thp.scalligraph.auth.{AuthContext, AuthContextImpl, UserSrv => UserDB}
 import org.thp.scalligraph.janus.JanusDatabase
-import org.thp.scalligraph.models.{Database, Entity, Schema, UniMapping}
-import org.thp.scalligraph.services.{DatabaseStorageSrv, HadoopStorageSrv, LocalFileSystemStorageSrv, S3StorageSrv, StorageSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.models.{Database, Entity, Schema, UMapping}
+import org.thp.scalligraph.services._
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.cortex.models.{CortexSchemaDefinition, TheHiveCortexSchemaProvider}
 import org.thp.thehive.connector.cortex.services.{ActionSrv, JobSrv}
 import org.thp.thehive.migration
 import org.thp.thehive.migration.IdMapping
 import org.thp.thehive.migration.dto._
 import org.thp.thehive.models._
-import org.thp.thehive.services.{
-  AlertSrv,
-  AttachmentSrv,
-  AuditSrv,
-  CaseSrv,
-  CaseTemplateSrv,
-  CustomFieldSrv,
-  DataSrv,
-  ImpactStatusSrv,
-  LocalUserSrv,
-  LogSrv,
-  ObservableSrv,
-  ObservableTypeSrv,
-  OrganisationSrv,
-  ProfileSrv,
-  ResolutionStatusSrv,
-  ShareSrv,
-  TagSrv,
-  TaskSrv,
-  UserSrv
-}
+import org.thp.thehive.services._
 import play.api.cache.SyncCacheApi
 import play.api.cache.ehcache.EhCacheModule
 import play.api.inject.guice.GuiceInjector
@@ -161,11 +141,11 @@ class Output @Inject() (
     val caseNumbersBuilder        = Set.newBuilder[Int]
     val alertsBuilder             = Set.newBuilder[(String, String, String)]
 
-    db.roTransaction { graph =>
-      graph
+    db.roTransaction { implicit graph =>
+      Traversal
         .V()
         .has(
-          Key[String]("_label"),
+          "_label",
           P.within(
             Seq(
               "Profile",
@@ -181,39 +161,39 @@ class Output @Inject() (
             )
           )
         )
-        .toIterator()
+        .toIterator
         .map(v => v.value[String]("_label") -> v)
         .foreach {
           case ("Profile", vertex) =>
-            val profile = profileSrv.model.toDomain(vertex)(db)
+            val profile = profileSrv.model.converter(vertex)
             profilesBuilder += (profile.name -> profile)
           case ("Organisation", vertex) =>
-            val organisation = organisationSrv.model.toDomain(vertex)(db)
+            val organisation = organisationSrv.model.converter(vertex)
             organisationsBuilder += (organisation.name -> organisation)
           case ("User", vertex) =>
-            val user = userSrv.model.toDomain(vertex)(db)
+            val user = userSrv.model.converter(vertex)
             usersBuilder += (user.login -> user)
           case ("ImpactStatus", vertex) =>
-            val impactStatuse = impactStatusSrv.model.toDomain(vertex)(db)
+            val impactStatuse = impactStatusSrv.model.converter(vertex)
             impactStatusesBuilder += (impactStatuse.value -> impactStatuse)
           case ("ResolutionStatus", vertex) =>
-            val resolutionStatuse = resolutionStatusSrv.model.toDomain(vertex)(db)
+            val resolutionStatuse = resolutionStatusSrv.model.converter(vertex)
             resolutionStatusesBuilder += (resolutionStatuse.value -> resolutionStatuse)
           case ("ObservableType", vertex) =>
-            val observableType = observableTypeSrv.model.toDomain(vertex)(db)
+            val observableType = observableTypeSrv.model.converter(vertex)
             observableTypesBuilder += (observableType.name -> observableType)
           case ("CustomField", vertex) =>
-            val customField = customFieldSrv.model.toDomain(vertex)(db)
+            val customField = customFieldSrv.model.converter(vertex)
             customFieldsBuilder += (customField.name -> customField)
           case ("CaseTemplate", vertex) =>
-            val caseTemplate = caseTemplateSrv.model.toDomain(vertex)(db)
+            val caseTemplate = caseTemplateSrv.model.converter(vertex)
             caseTemplatesBuilder += (caseTemplate.name -> caseTemplate)
           case ("Case", vertex) =>
-            caseNumbersBuilder += db.getSingleProperty(vertex, "number", UniMapping.int)
+            caseNumbersBuilder += UMapping.int.getProperty(vertex, "number")
           case ("Alert", vertex) =>
-            val `type`    = db.getSingleProperty(vertex, "type", UniMapping.string)
-            val source    = db.getSingleProperty(vertex, "source", UniMapping.string)
-            val sourceRef = db.getSingleProperty(vertex, "sourceRef", UniMapping.string)
+            val `type`    = UMapping.string.getProperty(vertex, "type")
+            val source    = UMapping.string.getProperty(vertex, "source")
+            val sourceRef = UMapping.string.getProperty(vertex, "sourceRef")
             alertsBuilder += ((`type`, source, sourceRef))
           case _ =>
         }
@@ -256,13 +236,13 @@ class Output @Inject() (
       case jdb: JanusDatabase => jdb.dropOtherConnections.recover { case error => logger.error(s"Fail to remove other connection", error) }
       case _                  =>
     }
-    if (db.version("thehive") == 0) {
+    if (db.version("thehive") == 0)
       db.createSchemaFrom(theHiveSchema)(LocalUserSrv.getSystemAuthContext)
         .flatMap(_ => db.setVersion(theHiveSchema.name, theHiveSchema.operations.lastVersion))
         .flatMap(_ => db.createSchemaFrom(cortexSchema)(LocalUserSrv.getSystemAuthContext))
         .flatMap(_ => db.setVersion(cortexSchema.name, cortexSchema.operations.lastVersion))
         .map(_ => retrieveExistingData())
-    } else {
+    else
       theHiveSchema
         .update(db)(LocalUserSrv.getSystemAuthContext)
         .flatMap(_ => cortexSchema.update(db)(LocalUserSrv.getSystemAuthContext))
@@ -270,7 +250,6 @@ class Output @Inject() (
           retrieveExistingData()
           db.removeAllIndexes()
         }
-    }
   }
 
   def endMigration(): Try[Unit] = {
@@ -286,10 +265,9 @@ class Output @Inject() (
   }
 
   def updateMetaData(entity: Entity, metaData: MetaData)(implicit graph: Graph): Unit = {
-    val e1 = graph.V(entity._id).property(Key[Date]("_createdAt"), metaData.createdAt)
-    val e2 = metaData.updatedAt.fold(e1)(e1.property(Key[Date]("_updatedAt"), _))
-    metaData.updatedAt.fold(e2)(e2.property(Key[Date]("_updatedAt"), _)).iterate()
-    ()
+    val vertex = Traversal.V(entity._id).head
+    UMapping.date.setProperty(vertex, "_createdAt", metaData.createdAt)
+    UMapping.date.optional.setProperty(vertex, "_updatedAt", metaData.updatedAt)
   }
 
   def getAuthContext(userId: String): AuthContext =
@@ -298,9 +276,10 @@ class Output @Inject() (
     else if (userId.contains('@')) AuthContextImpl(userId, userId, "admin", "mig-request", Permissions.all)
     else AuthContextImpl(s"$userId@$defaultUserDomain", s"$userId@$defaultUserDomain", "admin", "mig-request", Permissions.all)
 
-  def authTransaction[A](userId: String)(body: Graph => AuthContext => Try[A]): Try[A] = db.tryTransaction { implicit graph =>
-    body(graph)(getAuthContext(userId))
-  }
+  def authTransaction[A](userId: String)(body: Graph => AuthContext => Try[A]): Try[A] =
+    db.tryTransaction { implicit graph =>
+      body(graph)(getAuthContext(userId))
+    }
 
   def getTag(tagName: String)(implicit graph: Graph, authContext: AuthContext): Try[Tag with Entity] =
     cache.getOrElseUpdate(s"tag-$tagName")(tagSrv.createEntity(Tag.fromString(tagName, tagSrv.defaultNamespace, tagSrv.defaultColour)))
@@ -312,15 +291,15 @@ class Output @Inject() (
       .get(organisationName)
       .fold[Try[Organisation with Entity]](Failure(NotFoundError(s"Organisation $organisationName not found")))(Success.apply)
 
-  override def createOrganisation(inputOrganisation: InputOrganisation): Try[IdMapping] = authTransaction(inputOrganisation.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createOrganisation(inputOrganisation: InputOrganisation): Try[IdMapping] =
+    authTransaction(inputOrganisation.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create organisation ${inputOrganisation.organisation.name}")
       organisationSrv.create(inputOrganisation.organisation).map { o =>
         updateMetaData(o, inputOrganisation.metaData)
         organisations += (o.name -> o)
         IdMapping(inputOrganisation.metaData.id, o._id)
       }
-  }
+    }
 
   override def userExists(inputUser: InputUser): Boolean = {
     val validLogin =
@@ -338,8 +317,8 @@ class Output @Inject() (
       .fold[Try[User with Entity]](Failure(NotFoundError(s"User $login not found")))(Success.apply)
   }
 
-  override def createUser(inputUser: InputUser): Try[IdMapping] = authTransaction(inputUser.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createUser(inputUser: InputUser): Try[IdMapping] =
+    authTransaction(inputUser.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create user ${inputUser.user.login}")
       userSrv.checkUser(inputUser.user).flatMap(userSrv.createEntity).map { createdUser =>
         updateMetaData(createdUser, inputUser.metaData)
@@ -364,22 +343,22 @@ class Output @Inject() (
         users += (createdUser.login -> createdUser)
         IdMapping(inputUser.metaData.id, createdUser._id)
       }
-  }
+    }
 
   override def customFieldExists(inputCustomField: InputCustomField): Boolean = customFields.contains(inputCustomField.customField.name)
 
   private def getCustomField(name: String): Try[CustomField with Entity] =
     customFields.get(name).fold[Try[CustomField with Entity]](Failure(NotFoundError(s"Custom field $name not found")))(Success.apply)
 
-  override def createCustomField(inputCustomField: InputCustomField): Try[IdMapping] = authTransaction(inputCustomField.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createCustomField(inputCustomField: InputCustomField): Try[IdMapping] =
+    authTransaction(inputCustomField.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create custom field ${inputCustomField.customField.name}")
       customFieldSrv.create(inputCustomField.customField).map { cf =>
         updateMetaData(cf, inputCustomField.metaData)
         customFields += (cf.name -> cf)
         IdMapping(inputCustomField.customField.name, cf._id)
       }
-  }
+    }
 
   override def observableTypeExists(inputObservableType: InputObservableType): Boolean =
     observableTypes.contains(inputObservableType.observableType.name)
@@ -416,15 +395,15 @@ class Output @Inject() (
         }
       }(Success.apply)
 
-  override def createProfile(inputProfile: InputProfile): Try[IdMapping] = authTransaction(inputProfile.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createProfile(inputProfile: InputProfile): Try[IdMapping] =
+    authTransaction(inputProfile.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create profile ${inputProfile.profile.name}")
       profileSrv.create(inputProfile.profile).map { profile =>
         updateMetaData(profile, inputProfile.metaData)
         profiles += (profile.name -> profile)
         IdMapping(inputProfile.profile.name, profile._id)
       }
-  }
+    }
 
   override def impactStatusExists(inputImpactStatus: InputImpactStatus): Boolean = impactStatuses.contains(inputImpactStatus.impactStatus.value)
 
@@ -438,15 +417,15 @@ class Output @Inject() (
         }
       }(Success.apply)
 
-  override def createImpactStatus(inputImpactStatus: InputImpactStatus): Try[IdMapping] = authTransaction(inputImpactStatus.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createImpactStatus(inputImpactStatus: InputImpactStatus): Try[IdMapping] =
+    authTransaction(inputImpactStatus.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create impact status ${inputImpactStatus.impactStatus.value}")
       impactStatusSrv.create(inputImpactStatus.impactStatus).map { status =>
         updateMetaData(status, inputImpactStatus.metaData)
         impactStatuses += (status.value -> status)
         IdMapping(inputImpactStatus.impactStatus.value, status._id)
       }
-  }
+    }
 
   override def resolutionStatusExists(inputResolutionStatus: InputResolutionStatus): Boolean =
     resolutionStatuses.contains(inputResolutionStatus.resolutionStatus.value)
@@ -477,8 +456,8 @@ class Output @Inject() (
 
   private def getCaseTemplate(name: String): Option[CaseTemplate with Entity] = caseTemplates.get(name)
 
-  override def createCaseTemplate(inputCaseTemplate: InputCaseTemplate): Try[IdMapping] = authTransaction(inputCaseTemplate.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createCaseTemplate(inputCaseTemplate: InputCaseTemplate): Try[IdMapping] =
+    authTransaction(inputCaseTemplate.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create case template ${inputCaseTemplate.caseTemplate.name}")
       for {
         organisation     <- getOrganisation(inputCaseTemplate.organisation)
@@ -495,10 +474,10 @@ class Output @Inject() (
         }
         _ = caseTemplates += (inputCaseTemplate.caseTemplate.name -> richCaseTemplate.caseTemplate)
       } yield IdMapping(inputCaseTemplate.metaData.id, richCaseTemplate._id)
-  }
+    }
 
-  override def createCaseTemplateTask(caseTemplateId: String, inputTask: InputTask): Try[IdMapping] = authTransaction(inputTask.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createCaseTemplateTask(caseTemplateId: String, inputTask: InputTask): Try[IdMapping] =
+    authTransaction(inputTask.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create task ${inputTask.task.title} in case template $caseTemplateId")
       for {
         caseTemplate <- caseTemplateSrv.getOrFail(caseTemplateId)
@@ -507,11 +486,11 @@ class Output @Inject() (
         _ = updateMetaData(richTask.task, inputTask.metaData)
         _ <- caseTemplateSrv.addTask(caseTemplate, richTask.task)
       } yield IdMapping(inputTask.metaData.id, richTask._id)
-  }
+    }
 
   override def caseExists(inputCase: InputCase): Boolean = caseNumbers.contains(inputCase.`case`.number)
 
-  private def getCase(caseId: String)(implicit graph: Graph): Try[Case with Entity] = caseSrv.getByIds(caseId).getOrFail()
+  private def getCase(caseId: String)(implicit graph: Graph): Try[Case with Entity] = caseSrv.getByIds(caseId).getOrFail("Case")
 
   override def createCase(inputCase: InputCase): Try[IdMapping] =
     authTransaction(inputCase.metaData.createdBy) { implicit graph => implicit authContext =>
@@ -615,20 +594,20 @@ class Output @Inject() (
       for {
         observableType <- getObservableType(inputObservable.`type`)
         tags           <- inputObservable.tags.filterNot(_.isEmpty).toTry(getTag)
-        richObservable <- inputObservable
-          .dataOrAttachment
-          .fold(
-            { dataValue =>
-              dataSrv.createEntity(Data(dataValue)).flatMap { data =>
-                observableSrv.create(inputObservable.observable, observableType, data, tags, Nil)
-              }
-            }, { inputAttachment =>
-              attachmentSrv.create(inputAttachment.name, inputAttachment.size, inputAttachment.contentType, inputAttachment.data).flatMap {
-                attachment =>
-                  observableSrv.create(inputObservable.observable, observableType, attachment, tags, Nil)
-              }
-            }
-          )
+        richObservable <-
+          inputObservable
+            .dataOrAttachment
+            .fold(
+              dataValue =>
+                dataSrv.createEntity(Data(dataValue)).flatMap { data =>
+                  observableSrv.create(inputObservable.observable, observableType, data, tags, Nil)
+                },
+              inputAttachment =>
+                attachmentSrv.create(inputAttachment.name, inputAttachment.size, inputAttachment.contentType, inputAttachment.data).flatMap {
+                  attachment =>
+                    observableSrv.create(inputObservable.observable, observableType, attachment, tags, Nil)
+                }
+            )
         _ = updateMetaData(richObservable.observable, inputObservable.metaData)
         case0 <- getCase(caseId)
         orgs  <- inputObservable.organisations.toTry(getOrganisation)
@@ -653,20 +632,20 @@ class Output @Inject() (
         job            <- jobSrv.getOrFail(jobId)
         observableType <- getObservableType(inputObservable.`type`)
         tags = inputObservable.tags.filterNot(_.isEmpty).flatMap(getTag(_).toOption).toSeq
-        richObservable <- inputObservable
-          .dataOrAttachment
-          .fold(
-            { dataValue =>
-              dataSrv.createEntity(Data(dataValue)).flatMap { data =>
-                observableSrv.create(inputObservable.observable, observableType, data, tags, Nil)
-              }
-            }, { inputAttachment =>
-              attachmentSrv.create(inputAttachment.name, inputAttachment.size, inputAttachment.contentType, inputAttachment.data).flatMap {
-                attachment =>
-                  observableSrv.create(inputObservable.observable, observableType, attachment, tags, Nil)
-              }
-            }
-          )
+        richObservable <-
+          inputObservable
+            .dataOrAttachment
+            .fold(
+              dataValue =>
+                dataSrv.createEntity(Data(dataValue)).flatMap { data =>
+                  observableSrv.create(inputObservable.observable, observableType, data, tags, Nil)
+                },
+              inputAttachment =>
+                attachmentSrv.create(inputAttachment.name, inputAttachment.size, inputAttachment.contentType, inputAttachment.data).flatMap {
+                  attachment =>
+                    observableSrv.create(inputObservable.observable, observableType, attachment, tags, Nil)
+                }
+            )
         _ = updateMetaData(richObservable.observable, inputObservable.metaData)
         _ <- jobSrv.addObservable(job, richObservable.observable)
       } yield IdMapping(inputObservable.metaData.id, richObservable._id)
@@ -675,21 +654,22 @@ class Output @Inject() (
   override def alertExists(inputAlert: InputAlert): Boolean =
     alerts.contains((inputAlert.alert.`type`, inputAlert.alert.source, inputAlert.alert.sourceRef))
 
-  override def createAlert(inputAlert: InputAlert): Try[IdMapping] = authTransaction(inputAlert.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createAlert(inputAlert: InputAlert): Try[IdMapping] =
+    authTransaction(inputAlert.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create alert ${inputAlert.alert.`type`}:${inputAlert.alert.source}:${inputAlert.alert.sourceRef}")
       for {
         organisation <- getOrganisation(inputAlert.organisation)
-        caseTemplate = inputAlert
-          .caseTemplate
-          .flatMap(ct =>
-            getCaseTemplate(ct).orElse {
-              logger.warn(
-                s"Case template $ct not found (used in alert ${inputAlert.alert.`type`}:${inputAlert.alert.source}:${inputAlert.alert.sourceRef})"
-              )
-              None
-            }
-          )
+        caseTemplate =
+          inputAlert
+            .caseTemplate
+            .flatMap(ct =>
+              getCaseTemplate(ct).orElse {
+                logger.warn(
+                  s"Case template $ct not found (used in alert ${inputAlert.alert.`type`}:${inputAlert.alert.source}:${inputAlert.alert.sourceRef})"
+                )
+                None
+              }
+            )
         tags = inputAlert.tags.filterNot(_.isEmpty).flatMap(getTag(_).toOption).toSeq
 //        alert <- alertSrv.create(inputAlert.alert, organisation, tags, inputAlert.customFields, caseTemplate) // FIXME don't check duplicate
         alert <- alertSrv.createEntity(inputAlert.alert)
@@ -700,7 +680,7 @@ class Output @Inject() (
         _ = updateMetaData(alert, inputAlert.metaData)
         _ = inputAlert.caseId.flatMap(getCase(_).toOption).foreach(alertSrv.alertCaseSrv.create(AlertCase(), alert, _))
       } yield IdMapping(inputAlert.metaData.id, alert._id)
-  }
+    }
 
   override def createAlertObservable(alertId: String, inputObservable: InputObservable): Try[IdMapping] =
     authTransaction(inputObservable.metaData.createdBy) { implicit graph => implicit authContext =>
@@ -708,38 +688,39 @@ class Output @Inject() (
       for {
         observableType <- getObservableType(inputObservable.`type`)
         tags = inputObservable.tags.filterNot(_.isEmpty).flatMap(getTag(_).toOption).toSeq
-        richObservable <- inputObservable
-          .dataOrAttachment
-          .fold(
-            { dataValue =>
-              dataSrv.createEntity(Data(dataValue)).flatMap { data =>
-                observableSrv.create(inputObservable.observable, observableType, data, tags, Nil)
-              }
-            }, { inputAttachment =>
-              attachmentSrv.create(inputAttachment.name, inputAttachment.size, inputAttachment.contentType, inputAttachment.data).flatMap {
-                attachment =>
-                  observableSrv.create(inputObservable.observable, observableType, attachment, tags, Nil)
-              }
-            }
-          )
+        richObservable <-
+          inputObservable
+            .dataOrAttachment
+            .fold(
+              dataValue =>
+                dataSrv.createEntity(Data(dataValue)).flatMap { data =>
+                  observableSrv.create(inputObservable.observable, observableType, data, tags, Nil)
+                },
+              inputAttachment =>
+                attachmentSrv.create(inputAttachment.name, inputAttachment.size, inputAttachment.contentType, inputAttachment.data).flatMap {
+                  attachment =>
+                    observableSrv.create(inputObservable.observable, observableType, attachment, tags, Nil)
+                }
+            )
         _ = updateMetaData(richObservable.observable, inputObservable.metaData)
         alert <- alertSrv.getOrFail(alertId)
         _     <- alertSrv.alertObservableSrv.create(AlertObservable(), alert, richObservable.observable)
       } yield IdMapping(inputObservable.metaData.id, richObservable._id)
     }
 
-  private def getEntity(entityType: String, entityId: String)(implicit graph: Graph): Try[Entity] = entityType match {
-    case "Task"       => taskSrv.getOrFail(entityId)
-    case "Case"       => getCase(entityId)
-    case "Observable" => observableSrv.getOrFail(entityId)
-    case "Log"        => logSrv.getOrFail(entityId)
-    case "Alert"      => alertSrv.getOrFail(entityId)
-    case "Job"        => jobSrv.getOrFail(entityId)
-    case _            => Failure(BadRequestError(s"objectType $entityType is not recognised"))
-  }
+  private def getEntity(entityType: String, entityId: String)(implicit graph: Graph): Try[Product with Entity] =
+    entityType match {
+      case "Task"       => taskSrv.getOrFail(entityId)
+      case "Case"       => getCase(entityId)
+      case "Observable" => observableSrv.getOrFail(entityId)
+      case "Log"        => logSrv.getOrFail(entityId)
+      case "Alert"      => alertSrv.getOrFail(entityId)
+      case "Job"        => jobSrv.getOrFail(entityId)
+      case _            => Failure(BadRequestError(s"objectType $entityType is not recognised"))
+    }
 
-  override def createAction(objectId: String, inputAction: InputAction): Try[IdMapping] = authTransaction(inputAction.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createAction(objectId: String, inputAction: InputAction): Try[IdMapping] =
+    authTransaction(inputAction.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(
         s"Create action ${inputAction.action.cortexId}:${inputAction.action.workerName}:${inputAction.action.cortexJobId} for ${inputAction.objectType} $objectId"
       )
@@ -748,17 +729,17 @@ class Output @Inject() (
         action <- actionSrv.create(inputAction.action, entity)
         _ = updateMetaData(action.action, inputAction.metaData)
       } yield IdMapping(inputAction.metaData.id, action._id)
-  }
+    }
 
-  override def createAudit(contextId: String, inputAudit: InputAudit): Try[Unit] = authTransaction(inputAudit.metaData.createdBy) {
-    implicit graph => implicit authContext =>
+  override def createAudit(contextId: String, inputAudit: InputAudit): Try[Unit] =
+    authTransaction(inputAudit.metaData.createdBy) { implicit graph => implicit authContext =>
       logger.debug(s"Create audit ${inputAudit.audit.action} on ${inputAudit.audit.objectType} ${inputAudit.audit.objectId}")
       for {
         obj <- (for {
-          t <- inputAudit.audit.objectType
-          i <- inputAudit.audit.objectId
-        } yield getEntity(t, i)).flip
-        ctxType = obj.map(_._model.label).map {
+            t <- inputAudit.audit.objectType
+            i <- inputAudit.audit.objectId
+          } yield getEntity(t, i)).flip
+        ctxType = obj.map(_._label).map {
           case "Alert"                                        => "Alert"
           case "Log" | "Task" | "Observable" | "Case" | "Job" => "Case"
           case "User"                                         => "User"
@@ -774,5 +755,5 @@ class Output @Inject() (
         _ <- obj.map(auditSrv.auditedSrv.create(Audited(), createdAudit, _)).flip
         _ <- context.map(auditSrv.auditContextSrv.create(AuditContext(), createdAudit, _)).flip
       } yield ()
-  }
+    }
 }
diff --git a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/MispModule.scala b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/MispModule.scala
index 2ad4dfd52b..64f092f0bc 100644
--- a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/MispModule.scala
+++ b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/MispModule.scala
@@ -32,5 +32,6 @@ class MispModule(environment: Environment, configuration: Configuration) extends
     bind[ActorRef]
       .annotatedWithName("misp-actor")
       .toProvider[MispActorProvider]
+    ()
   }
 }
diff --git a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/controllers/v0/MispCtrl.scala b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/controllers/v0/MispCtrl.scala
index cad0dc5018..125cd68ef3 100644
--- a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/controllers/v0/MispCtrl.scala
+++ b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/controllers/v0/MispCtrl.scala
@@ -5,9 +5,11 @@ import com.google.inject.name.Named
 import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.Entrypoint
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.connector.misp.services.{MispActor, MispExportSrv}
 import org.thp.thehive.models.Permissions
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services.{AlertSrv, CaseSrv}
 import play.api.mvc.{Action, AnyContent, Results}
 
@@ -50,7 +52,7 @@ class MispCtrl @Inject() (
     entrypoint("clean MISP alerts")
       .authTransaction(db) { implicit request => implicit graph =>
         alertSrv
-          .initSteps
+          .startTraversal
           .has("type", "misp")
           .visible
           .toIterator
diff --git a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispExportSrv.scala b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispExportSrv.scala
index a0c1b03056..e91746d231 100644
--- a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispExportSrv.scala
+++ b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispExportSrv.scala
@@ -2,14 +2,16 @@ package org.thp.thehive.connector.misp.services
 
 import java.util.Date
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.misp.dto.{Attribute, Tag => MispTag}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AuthorizationError, BadRequestError, NotFoundError}
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
 import org.thp.thehive.services.{AlertSrv, AttachmentSrv, CaseSrv, OrganisationSrv}
 import play.api.Logger
 
@@ -72,7 +74,7 @@ class MispExportSrv @Inject() (
       .alert
       .has("type", "misp")
       .has("source", orgName)
-      .headOption()
+      .headOption
 
   def getAttributes(`case`: Case with Entity)(implicit graph: Graph, authContext: AuthContext): Iterator[Attribute] =
     caseSrv.get(`case`).observables.has("ioc", true).richObservable.toIterator.flatMap(observableToAttribute)
@@ -133,7 +135,7 @@ class MispExportSrv @Inject() (
 
   def canExport(client: TheHiveMispClient)(implicit authContext: AuthContext): Boolean =
     client.canExport && db.roTransaction { implicit graph =>
-      client.organisationFilter(organisationSrv.current).exists()
+      client.organisationFilter(organisationSrv.current).exists
     }
 
   def export(mispId: String, `case`: Case with Entity)(implicit authContext: AuthContext, ec: ExecutionContext): Future[String] = {
diff --git a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispImportSrv.scala b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispImportSrv.scala
index 4ca105880b..8e0f6d77e6 100644
--- a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispImportSrv.scala
+++ b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispImportSrv.scala
@@ -6,20 +6,21 @@ import java.util.Date
 import akka.stream.Materializer
 import akka.stream.scaladsl.{FileIO, Sink, Source}
 import akka.util.ByteString
-import gremlin.scala.{__, By, Key, P, Vertex}
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.process.traversal.P
 import org.thp.misp.dto.{Attribute, Event, Tag => MispTag}
 import org.thp.scalligraph.RichSeq
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models.{Database, Entity}
-import org.thp.scalligraph.services.RichVertexGremlinScala
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
 import org.thp.thehive.services._
 import play.api.Logger
 
-import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success, Try}
 
@@ -75,13 +76,13 @@ class MispImportSrv @Inject() (
         db.roTransaction { implicit graph =>
           observableTypeSrv
             .get(attrConv.`type`)
-            .headOption()
+            .headOption
             .map(_ -> attrConv.tags)
         }
       }
     db.roTransaction { implicit graph =>
       obsTypeFromConfig
-        .orElse(observableTypeSrv.get(attributeType).headOption().map(_ -> Nil))
+        .orElse(observableTypeSrv.get(attributeType).headOption.map(_ -> Nil))
         .fold(observableTypeSrv.getOrFail("other").map(_ -> Seq.empty[String]))(Success(_))
     }
   }
@@ -152,27 +153,23 @@ class MispImportSrv @Inject() (
       }
 
   def getLastSyncDate(client: TheHiveMispClient, mispOrganisation: String, organisations: Seq[Organisation with Entity]): Option[Date] = {
-    val lastOrgSynchro = db
-      .roTransaction { implicit graph =>
-        client
-          .organisationFilter(organisationSrv.initSteps)
-          .groupBy(
-            By(),
-            By(
-              __[Vertex]
-                .inTo[AlertOrganisation]
-                .has(Key("source") of mispOrganisation)
-                .has(Key("type") of "misp")
-                .value[Date]("lastSyncDate")
-                .max[Date]
-            )
+    val lastOrgSynchro = db.roTransaction { implicit graph =>
+      client
+        .organisationFilter(organisationSrv.startTraversal)
+        .group(
+          _.by,
+          _.by(
+            _.in[AlertOrganisation]
+              .v[Alert]
+              .has("source", mispOrganisation)
+              .has("type", "misp")
+              .value(_.lastSyncDate)
+              .max
           )
-          .head()
-      }
-      .values()
-      .asScala
-      .toSeq
-      .asInstanceOf[Seq[Date]]
+        )
+        .head
+    }.values
+//      .asInstanceOf[Seq[Date]]
 
     if (lastOrgSynchro.size == organisations.size && organisations.nonEmpty) Some(lastOrgSynchro.min)
     else None
@@ -192,7 +189,7 @@ class MispImportSrv @Inject() (
         .filterOnType(observableType.name)
         .filterOnData(data)
         .richObservable
-        .headOption() match {
+        .headOption match {
         case None =>
           logger.debug(s"Observable ${observableType.name}:$data doesn't exist, create it")
           for {
@@ -201,13 +198,15 @@ class MispImportSrv @Inject() (
           } yield richObservable.observable
         case Some(richObservable) =>
           logger.debug(s"Observable ${observableType.name}:$data exists, update it")
-          val updateFields = (if (richObservable.message != observable.message) Seq("message" -> observable.message) else Nil) ++
-            (if (richObservable.tlp != observable.tlp) Seq("tlp"             -> observable.tlp) else Nil) ++
-            (if (richObservable.ioc != observable.ioc) Seq("ioc"             -> observable.ioc) else Nil) ++
-            (if (richObservable.sighted != observable.sighted) Seq("sighted" -> observable.sighted) else Nil)
-          for { // update observable even if updateFields is empty in order to remove unupdated observables
-            updatedObservable <- observableSrv.get(richObservable.observable).updateOne(updateFields: _*)
-            _                 <- observableSrv.updateTagNames(updatedObservable, tags)
+          for {
+            updatedObservable <- Some(observableSrv.get(richObservable.observable))
+              .map(t => if (richObservable.message != observable.message) t.update(_.message, observable.message) else t)
+              .map(t => if (richObservable.tlp != observable.tlp) t.update(_.tlp, observable.tlp) else t)
+              .map(t => if (richObservable.ioc != observable.ioc) t.update(_.ioc, observable.ioc) else t)
+              .map(t => if (richObservable.sighted != observable.sighted) t.update(_.sighted, observable.sighted) else t)
+              .get
+              .getOrFail("Observable")
+            _ <- observableSrv.updateTagNames(updatedObservable, tags)
           } yield updatedObservable
       }
     }
@@ -229,7 +228,7 @@ class MispImportSrv @Inject() (
         .filterOnAttachmentName(filename)
         .filterOnAttachmentName(contentType)
         .richObservable
-        .headOption()
+        .headOption
     } match {
       case None =>
         logger.debug(s"Observable ${observableType.name}:$filename:$contentType doesn't exist, create it")
@@ -250,15 +249,17 @@ class MispImportSrv @Inject() (
           .andThen { case _ => Files.delete(file) }
       case Some(richObservable) =>
         logger.debug(s"Observable ${observableType.name}:$filename:$contentType exists, update it")
-        val updateFields = (if (richObservable.message != observable.message) Seq("message" -> observable.message) else Nil) ++
-          (if (richObservable.tlp != observable.tlp) Seq("tlp"             -> observable.tlp) else Nil) ++
-          (if (richObservable.ioc != observable.ioc) Seq("ioc"             -> observable.ioc) else Nil) ++
-          (if (richObservable.sighted != observable.sighted) Seq("sighted" -> observable.sighted) else Nil)
         Future.fromTry {
           db.tryTransaction { implicit graph =>
-            for { // update observable even if updateFields is empty in order to remove unupdated observables
-              updatedObservable <- observableSrv.get(richObservable.observable).updateOne(updateFields: _*)
-              _                 <- observableSrv.updateTagNames(updatedObservable, tags)
+            for {
+              updatedObservable <- Some(observableSrv.get(richObservable.observable))
+                .map(t => if (richObservable.message != observable.message) t.update(_.message, observable.message) else t)
+                .map(t => if (richObservable.tlp != observable.tlp) t.update(_.tlp, observable.tlp) else t)
+                .map(t => if (richObservable.ioc != observable.ioc) t.update(_.ioc, observable.ioc) else t)
+                .map(t => if (richObservable.sighted != observable.sighted) t.update(_.sighted, observable.sighted) else t)
+                .get
+                .getOrFail("Observable")
+              _ <- observableSrv.updateTagNames(updatedObservable, tags)
             } yield updatedObservable
           }
         }
@@ -346,25 +347,27 @@ class MispImportSrv @Inject() (
           .alerts
           .getBySourceId("misp", mispOrganisation, event.id)
           .richAlert
-          .headOption() match {
+          .headOption match {
           case None => // if the related alert doesn't exist, create it
             logger.debug(s"Event ${client.name}#${event.id} has no related alert for organisation ${organisation.name}")
             alertSrv
               .create(alert, organisation, event.tags.map(_.name).toSet, Map.empty[String, Option[Any]], caseTemplate)
               .map(_.alert)
-          case Some(richAlert) =>
+          case someAlert @ Some(richAlert) =>
             logger.debug(s"Event ${client.name}#${event.id} have already been imported for organisation ${organisation.name}, updating the alert")
-            val updateFields = (if (richAlert.title != alert.title) Seq("title" -> alert.title) else Nil) ++
-              (if (richAlert.lastSyncDate != alert.lastSyncDate) Seq("lastSyncDate" -> alert.lastSyncDate) else Nil) ++
-              (if (richAlert.description != alert.description) Seq("description"    -> alert.description) else Nil) ++
-              (if (richAlert.severity != alert.severity) Seq("severity"             -> alert.severity) else Nil) ++
-              (if (richAlert.date != alert.date) Seq("date"                         -> alert.date) else Nil) ++
-              (if (richAlert.tlp != alert.tlp) Seq("tlp"                            -> alert.tlp) else Nil) ++
-              (if (richAlert.pap != alert.pap) Seq("pap"                            -> alert.pap) else Nil) ++
-              (if (richAlert.externalLink != alert.externalLink) Seq("externalLink" -> alert.externalLink) else Nil)
             for {
-              updatedAlert <- if (updateFields.nonEmpty) alertSrv.get(richAlert.alert).updateOne(updateFields: _*) else Success(richAlert.alert)
-              _            <- alertSrv.updateTagNames(updatedAlert, event.tags.map(_.name).toSet)
+              updatedAlert <- Some(alertSrv.get(richAlert.alert))
+                .map(t => if (richAlert.title != alert.title) t.update(_.title, alert.title) else t)
+                .map(t => if (richAlert.lastSyncDate != alert.lastSyncDate) t.update(_.lastSyncDate, alert.lastSyncDate) else t)
+                .map(t => if (richAlert.description != alert.description) t.update(_.description, alert.description) else t)
+                .map(t => if (richAlert.severity != alert.severity) t.update(_.severity, alert.severity) else t)
+                .map(t => if (richAlert.date != alert.date) t.update(_.date, alert.date) else t)
+                .map(t => if (richAlert.tlp != alert.tlp) t.update(_.tlp, alert.tlp) else t)
+                .map(t => if (richAlert.pap != alert.pap) t.update(_.pap, alert.pap) else t)
+                .map(t => if (richAlert.externalLink != alert.externalLink) t.update(_.externalLink, alert.externalLink) else t)
+                .get
+                .getOrFail("Alert")
+              _ <- alertSrv.updateTagNames(updatedAlert, event.tags.map(_.name).toSet)
             } yield updatedAlert
         }
       }
@@ -375,30 +378,34 @@ class MispImportSrv @Inject() (
     Future.fromTry(client.currentOrganisationName).flatMap { mispOrganisation =>
       lazy val caseTemplate = client.caseTemplate.flatMap { caseTemplateName =>
         db.roTransaction { implicit graph =>
-          caseTemplateSrv.get(caseTemplateName).headOption()
+          caseTemplateSrv.get(caseTemplateName).headOption
         }
       }
+      logger.debug(s"Get eligible organisations")
       val organisations = db.roTransaction { implicit graph =>
-        client.organisationFilter(organisationSrv.initSteps).toList
+        client.organisationFilter(organisationSrv.startTraversal).toSeq
       }
       val lastSynchro = getLastSyncDate(client, mispOrganisation, organisations)
       logger.debug(s"Last synchronisation is $lastSynchro")
       client
         .searchEvents(publishDate = lastSynchro)
         .runWith(Sink.foreachAsync(1) { event =>
-          logger.debug(s"Importing event ${client.name}#${event.id}")
+          logger.debug(s"Importing event ${client.name}#${event.id} in organisation(s): ${organisations.mkString(",")}")
           Future
             .traverse(organisations) { organisation =>
               Future
                 .fromTry(updateOrCreateAlert(client, organisation, mispOrganisation, event, caseTemplate))
                 .flatMap(alert => importAttibutes(client, event, alert, lastSynchro))
-                .recoverWith {
+                .recover {
                   case error =>
                     logger.warn(s"Unable to create alert from MISP event ${client.name}#${event.id}", error)
-                    Future.successful(())
                 }
             }
             .map(_ => ())
+            .recover {
+              case error =>
+                logger.warn(s"Unable to create alert from MISP event ${client.name}#${event.id}", error)
+            }
         })
         .map(_ => ())
     }
diff --git a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/TheHiveMispClient.scala b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/TheHiveMispClient.scala
index 5e11d651f6..690098fc46 100644
--- a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/TheHiveMispClient.scala
+++ b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/TheHiveMispClient.scala
@@ -1,14 +1,14 @@
 package org.thp.thehive.connector.misp.services
 
 import akka.stream.Materializer
-import gremlin.scala.P
 import javax.inject.Inject
+import org.apache.tinkerpop.gremlin.process.traversal.P
 import org.thp.client.{Authentication, ProxyWS, ProxyWSConfig}
 import org.thp.misp.client.{MispClient, MispPurpose}
 import org.thp.scalligraph.services.config.ApplicationConfig.durationFormat
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.models.HealthStatus
-import org.thp.thehive.services.OrganisationSteps
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.models.{HealthStatus, Organisation}
 import play.api.libs.json._
 import play.api.libs.ws.WSClient
 import play.api.libs.ws.ahc.AhcWSClientConfig
@@ -137,7 +137,7 @@ class TheHiveMispClient(
     case MispPurpose.ExportOnly      => (false, true)
   }
 
-  def organisationFilter(organisationSteps: OrganisationSteps): OrganisationSteps = {
+  def organisationFilter(organisationSteps: Traversal.V[Organisation]): Traversal.V[Organisation] = {
     val includedOrgs =
       if (includedTheHiveOrganisations.contains("*") || includedTheHiveOrganisations.isEmpty) organisationSteps
       else organisationSteps.has("name", P.within(includedTheHiveOrganisations))
diff --git a/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala b/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala
index a26082f878..d97fb7ac64 100644
--- a/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala
+++ b/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala
@@ -8,9 +8,12 @@ import org.thp.misp.dto.{Event, Organisation, Tag, User}
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models.{Alert, Permissions}
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
 import org.thp.thehive.services.{AlertSrv, OrganisationSrv}
 import play.api.test.PlaySpecification
 
@@ -68,12 +71,12 @@ class MispImportSrvTest(implicit ec: ExecutionContext) extends PlaySpecification
     }
   }
 
-  "MISP service " should {
+  "MISP service" should {
     "import events" in testApp { app =>
       await(app[MispImportSrv].syncMispEvents(app[TheHiveMispClient])(authContext))(1.minute)
 
       app[Database].roTransaction { implicit graph =>
-        app[AlertSrv].initSteps.getBySourceId("misp", "ORGNAME", "1").visible.getOrFail("Alert")
+        app[AlertSrv].startTraversal.getBySourceId("misp", "ORGNAME", "1").visible.getOrFail("Alert")
       } must beSuccessfulTry(
         Alert(
           `type` = "misp",
@@ -90,7 +93,7 @@ class MispImportSrvTest(implicit ec: ExecutionContext) extends PlaySpecification
           read = false,
           follow = true
         )
-      )
+      ).eventually(5, 100.milliseconds)
 
       val observables = app[Database]
         .roTransaction { implicit graph =>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 3ec6059bdc..8b8c345296 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
   lazy val playLogback             = "com.typesafe.play"        %% "play-logback"                       % play.core.PlayVersion.current
   lazy val playGuice               = "com.typesafe.play"        %% "play-guice"                         % play.core.PlayVersion.current
   lazy val playFilters             = "com.typesafe.play"        %% "filters-helpers"                    % play.core.PlayVersion.current
-  lazy val playMockws              = "de.leanovate.play-mockws" %% "play-mockws"                        % "2.8.0" // FIXME play.core.PlayVersion.current
+  lazy val playMockws              = "de.leanovate.play-mockws" %% "play-mockws"                        % "2.8.0"
   lazy val akkaCluster             = "com.typesafe.akka"        %% "akka-cluster"                       % akkaVersion
   lazy val akkaClusterTools        = "com.typesafe.akka"        %% "akka-cluster-tools"                 % akkaVersion
   lazy val akkaClusterTyped        = "com.typesafe.akka"        %% "akka-cluster-typed"                 % akkaVersion
@@ -24,6 +24,7 @@ object Dependencies {
   lazy val janusGraphCassandra     = "org.janusgraph"           % "janusgraph-cql"                      % janusVersion
   lazy val janusGraphInMemory      = "org.janusgraph"           % "janusgraph-inmemory"                 % janusVersion
   lazy val janusGraphDriver        = "org.janusgraph"           % "janusgraph-driver"                   % janusVersion
+  lazy val tinkerpop               = "org.apache.tinkerpop"     % "gremlin-core"                        % "3.4.7"
   lazy val gremlinScala            = "com.michaelpollmeier"     %% "gremlin-scala"                      % "3.4.4.5"
   lazy val gremlinOrientdb         = "com.orientechnologies"    % "orientdb-gremlin"                    % "3.0.18"
   lazy val hbaseClient             = "org.apache.hbase"         % "hbase-shaded-client"                 % "1.4.9" exclude ("org.slf4j", "slf4j-log4j12")
diff --git a/thehive/app/org/thp/thehive/ClusterSetup.scala b/thehive/app/org/thp/thehive/ClusterSetup.scala
index 1adffcea3e..308e0f6d8b 100644
--- a/thehive/app/org/thp/thehive/ClusterSetup.scala
+++ b/thehive/app/org/thp/thehive/ClusterSetup.scala
@@ -4,12 +4,8 @@ import akka.actor.ActorSystem
 import akka.cluster.Cluster
 import com.google.inject.Injector
 import javax.inject.{Inject, Singleton}
-import org.thp.scalligraph.models.Database
-import play.api.inject.ApplicationLifecycle
 import play.api.{Configuration, Logger}
 
-import scala.concurrent.Future
-
 @Singleton
 class ClusterSetup @Inject() (
     configuration: Configuration,
diff --git a/thehive/app/org/thp/thehive/TheHiveModule.scala b/thehive/app/org/thp/thehive/TheHiveModule.scala
index 18e2ed1d81..5e3e2a5afe 100644
--- a/thehive/app/org/thp/thehive/TheHiveModule.scala
+++ b/thehive/app/org/thp/thehive/TheHiveModule.scala
@@ -10,22 +10,7 @@ import org.thp.scalligraph.services.{GenIntegrityCheckOps, HadoopStorageSrv, S3S
 import org.thp.thehive.models.{DatabaseProvider, TheHiveSchemaDefinition}
 import org.thp.thehive.services.notification.notifiers._
 import org.thp.thehive.services.notification.triggers._
-import org.thp.thehive.services.{
-  CaseIntegrityCheckOps,
-  CaseTemplateIntegrityCheckOps,
-  CustomFieldIntegrityCheckOps,
-  DataIntegrityCheckOps,
-  FlowActorProvider,
-  ImpactStatusIntegrityCheckOps,
-  IntegrityCheckActorProvider,
-  ObservableTypeIntegrityCheckOps,
-  OrganisationIntegrityCheckOps,
-  ProfileIntegrityCheckOps,
-  ResolutionStatusIntegrityCheckOps,
-  TOTPAuthSrvProvider,
-  TagIntegrityCheckOps,
-  UserIntegrityCheckOps
-}
+import org.thp.thehive.services.{UserSrv => _, _}
 import play.api.libs.concurrent.AkkaGuiceSupport
 //import org.thp.scalligraph.orientdb.{OrientDatabase, OrientDatabaseStorageSrv}
 import org.thp.scalligraph.services.config.ConfigActor
@@ -59,7 +44,6 @@ class TheHiveModule(environment: Environment, configuration: Configuration) exte
     authBindings.addBinding.to[PkiAuthProvider]
     authBindings.addBinding.to[SessionAuthProvider]
     authBindings.addBinding.to[OAuth2Provider]
-    // TODO add more authSrv
 
     val triggerBindings = ScalaMultibinder.newSetBinder[TriggerProvider](binder)
     triggerBindings.addBinding.to[AlertCreatedProvider]
diff --git a/thehive/app/org/thp/thehive/controllers/dav/Router.scala b/thehive/app/org/thp/thehive/controllers/dav/Router.scala
index dc1a4cf036..56427ce74f 100644
--- a/thehive/app/org/thp/thehive/controllers/dav/Router.scala
+++ b/thehive/app/org/thp/thehive/controllers/dav/Router.scala
@@ -69,7 +69,7 @@ class Router @Inject() (entrypoint: Entrypoint, vfs: VFS, @Named("with-thehive-s
           if (request.uri.endsWith("/")) request.uri
           else request.uri + '/'
         val resources =
-          if (request.headers.get("Depth").contains("1")) vfs.get(pathElements) ::: vfs.list(pathElements)
+          if (request.headers.get("Depth").contains("1")) vfs.get(pathElements) ++ vfs.list(pathElements)
           else vfs.get(pathElements)
         val props: NodeSeq = request.body("xml") \ "prop" \ "_"
         val response = <D:multistatus xmlns:D="DAV:">
diff --git a/thehive/app/org/thp/thehive/controllers/dav/VFS.scala b/thehive/app/org/thp/thehive/controllers/dav/VFS.scala
index cfd2423365..d13b2606b6 100644
--- a/thehive/app/org/thp/thehive/controllers/dav/VFS.scala
+++ b/thehive/app/org/thp/thehive/controllers/dav/VFS.scala
@@ -1,63 +1,67 @@
 package org.thp.thehive.controllers.dav
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services.CaseSrv
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.TaskOps._
 
 @Singleton
 class VFS @Inject() (caseSrv: CaseSrv) {
 
-  def get(path: List[String])(implicit graph: Graph, authContext: AuthContext): List[Resource] = path match {
+  def get(path: List[String])(implicit graph: Graph, authContext: AuthContext): Seq[Resource] = path match {
     case Nil | "" :: Nil                        => List(StaticResource(""))
     case "cases" :: Nil                         => List(StaticResource(""))
-    case "cases" :: cid :: Nil                  => caseSrv.initSteps.getByNumber(cid.toInt).toList.map(EntityResource(_, ""))
+    case "cases" :: cid :: Nil                  => caseSrv.startTraversal.getByNumber(cid.toInt).toSeq.map(EntityResource(_, ""))
     case "cases" :: cid :: "observables" :: Nil => List(StaticResource(""))
     case "cases" :: cid :: "tasks" :: Nil       => List(StaticResource(""))
     case "cases" :: cid :: "observables" :: aid :: Nil =>
       caseSrv
-        .initSteps
+        .startTraversal
         .getByNumber(cid.toInt)
         .observables
         .attachments
         .has("attachmentId", aid)
-        .toList
+        .toSeq
         .map(AttachmentResource(_, emptyId = true))
     case "cases" :: cid :: "tasks" :: aid :: Nil =>
       caseSrv
-        .initSteps
+        .startTraversal
         .getByNumber(cid.toInt)
         .tasks
         .logs
         .attachments
         .has("attachmentId", aid)
-        .toList
+        .toSeq
         .map(AttachmentResource(_, emptyId = true))
     case _ => Nil
   }
 
-  def list(path: List[String])(implicit graph: Graph, authContext: AuthContext): List[Resource] = path match {
+  def list(path: List[String])(implicit graph: Graph, authContext: AuthContext): Seq[Resource] = path match {
     case Nil | "" :: Nil       => List(StaticResource("cases"))
-    case "cases" :: Nil        => caseSrv.initSteps.visible.toList.map(c => EntityResource(c, c.number.toString))
+    case "cases" :: Nil        => caseSrv.startTraversal.visible.toSeq.map(c => EntityResource(c, c.number.toString))
     case "cases" :: cid :: Nil => List(StaticResource("observables"), StaticResource("tasks"))
     case "cases" :: cid :: "observables" :: Nil =>
       caseSrv
-        .initSteps
+        .startTraversal
         .getByNumber(cid.toInt)
         .observables
         .attachments
-        .map(AttachmentResource(_, emptyId = false))
-        .toList
+        .domainMap(AttachmentResource(_, emptyId = false))
+        .toSeq
     case "cases" :: cid :: "tasks" :: Nil =>
       caseSrv
-        .initSteps
+        .startTraversal
         .getByNumber(cid.toInt)
         .tasks
         .logs
         .attachments
-        .map(AttachmentResource(_, emptyId = false))
-        .toList
+        .domainMap(AttachmentResource(_, emptyId = false))
+        .toSeq
     case _ => Nil
   }
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
index 5b608c6222..08cf9dafdd 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
@@ -1,32 +1,36 @@
 package org.thp.thehive.controllers.v0
 
-import java.util.Base64
+import java.util.{Base64, List => JList, Map => JMap}
 
-import gremlin.scala.Graph
 import io.scalaland.chimney.dsl._
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.{Entrypoint, FString, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{PagedResult, Traversal}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, IteratorOutput, Traversal}
 import org.thp.scalligraph.{AuthorizationError, InvalidFormatAttributeError, RichSeq}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.{InputAlert, InputObservable, OutputSimilarCase}
 import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.Logger
 import play.api.libs.json.{JsArray, JsObject, Json}
 import play.api.mvc.{Action, AnyContent, Results}
 
-import scala.collection.JavaConverters._
 import scala.util.{Failure, Success, Try}
 
 @Singleton
 class AlertCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     alertSrv: AlertSrv,
     caseTemplateSrv: CaseTemplateSrv,
@@ -35,41 +39,46 @@ class AlertCtrl @Inject() (
     attachmentSrv: AttachmentSrv,
     organisationSrv: OrganisationSrv,
     auditSrv: AuditSrv,
-    val userSrv: UserSrv,
-    val caseSrv: CaseSrv
+    userSrv: UserSrv,
+    caseSrv: CaseSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "alert"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.alert ::: metaProperties[AlertSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.alert
   override val initialQuery: Query =
-    Query.init[AlertSteps]("listAlert", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).alerts)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, AlertSteps](
+    Query
+      .init[Traversal.V[Alert]]("listAlert", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).alerts)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Alert]](
     "getAlert",
     FieldsParser[IdOrName],
     (param, graph, authContext) => alertSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, AlertSteps, PagedResult[(RichAlert, Seq[RichObservable])]](
-    "page",
-    FieldsParser[OutputParam],
-    (range, alertSteps, _) =>
-      alertSteps
-        .richPage(range.from, range.to, withTotal = true)(_.richAlert)
-        .map { richAlert =>
-          richAlert -> alertSrv.get(richAlert.alert)(alertSteps.graph).observables.richObservable.toList
-        }
-  )
-  override val outputQuery: Query = Query.output[RichAlert, AlertSteps](_.richAlert)
+  override val pageQuery: ParamQuery[OutputParam] =
+    Query.withParam[OutputParam, Traversal.V[Alert], IteratorOutput](
+      "page",
+      FieldsParser[OutputParam],
+      (range, alertSteps, _) =>
+        alertSteps
+          .richPage(range.from, range.to, withTotal = true) { alerts =>
+            alerts.project(_.by(_.richAlert).by(_.observables.richObservable.fold))
+          }
+    )
+  override val outputQuery: Query = Query.output[RichAlert, Traversal.V[Alert]](_.richAlert)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[AlertSteps, CaseSteps]("cases", (alertSteps, _) => alertSteps.`case`),
-    Query[AlertSteps, ObservableSteps]("observables", (alertSteps, _) => alertSteps.observables),
-    Query[AlertSteps, Traversal[(RichAlert, Seq[RichObservable]), (RichAlert, Seq[RichObservable])]](
+    Query[Traversal.V[Alert], Traversal.V[Case]]("cases", (alertSteps, _) => alertSteps.`case`),
+    Query[Traversal.V[Alert], Traversal.V[Observable]]("observables", (alertSteps, _) => alertSteps.observables),
+    Query[
+      Traversal.V[Alert],
+      Traversal[(RichAlert, Seq[RichObservable]), JMap[String, Any], Converter[(RichAlert, Seq[RichObservable]), JMap[String, Any]]]
+    ](
       "withObservables",
       (alertSteps, _) =>
         alertSteps
-          .richAlert
-          .map { richAlert =>
-            richAlert -> alertSrv.get(richAlert.alert)(alertSteps.graph).observables.richObservable.toList
-          }
+          .project(
+            _.by(_.richAlert)
+              .by(_.observables.richObservable.fold)
+          )
     ),
     Query.output[(RichAlert, Seq[RichObservable])]
   )
@@ -84,7 +93,7 @@ class AlertCtrl @Inject() (
         val inputAlert: InputAlert            = request.body("alert")
         val observables: Seq[InputObservable] = request.body("observables")
         val customFields                      = inputAlert.customFields.map(c => c.name -> c.value).toMap
-        val caseTemplate                      = caseTemplateName.flatMap(caseTemplateSrv.get(_).visible.headOption())
+        val caseTemplate                      = caseTemplateName.flatMap(caseTemplateSrv.get(_).visible.headOption)
         for {
           organisation <- userSrv
             .current
@@ -97,13 +106,14 @@ class AlertCtrl @Inject() (
         } yield Results.Created((richAlert -> richObservables).toJson)
       }
 
-  def alertSimilarityRenderer(implicit authContext: AuthContext): AlertSteps => Traversal[JsArray, JsArray] = { alertSteps =>
-    alertSteps
-      .similarCases
+  def alertSimilarityRenderer(
+      implicit authContext: AuthContext
+  ): Traversal.V[Alert] => Traversal[JsArray, JList[JMap[String, Any]], Converter[JsArray, JList[JMap[String, Any]]]] =
+    _.similarCases
       .fold
-      .map { similarCases =>
+      .domainMap { similarCases =>
         JsArray {
-          similarCases.asScala.map {
+          similarCases.map {
             case (richCase, similarStats) =>
               val similarCase = richCase
                 .into[OutputSimilarCase]
@@ -120,7 +130,6 @@ class AlertCtrl @Inject() (
           }
         }
       }
-  }
 
   def get(alertId: String): Action[AnyContent] =
     entrypoint("get alert")
@@ -134,21 +143,21 @@ class AlertCtrl @Inject() (
         if (similarity.contains(true))
           alert
             .richAlertWithCustomRenderer(alertSimilarityRenderer(request))
-            .getOrFail()
+            .getOrFail("Alert")
             .map {
               case (richAlert, similarCases) =>
                 val alertWithObservables: (RichAlert, Seq[RichObservable]) =
-                  richAlert -> alertSrv.get(richAlert.alert).observables.richObservableWithSeen.toList
+                  richAlert -> alertSrv.get(richAlert.alert).observables.richObservableWithSeen.toSeq
 
                 Results.Ok(alertWithObservables.toJson.as[JsObject] + ("similarCases" -> similarCases))
             }
         else
           alert
             .richAlert
-            .getOrFail()
+            .getOrFail("Alert")
             .map { richAlert =>
               val alertWithObservables: (RichAlert, Seq[RichObservable]) =
-                richAlert -> alertSrv.get(richAlert.alert).observables.richObservable.toList
+                richAlert -> alertSrv.get(richAlert.alert).observables.richObservable.toSeq
               Results.Ok(alertWithObservables.toJson)
             }
 
@@ -161,9 +170,9 @@ class AlertCtrl @Inject() (
         val propertyUpdaters: Seq[PropertyUpdater] = request.body("alert")
         alertSrv
           .update(_.get(alertId).can(Permissions.manageAlert), propertyUpdaters)
-          .flatMap { case (alertSteps, _) => alertSteps.richAlert.getOrFail() }
+          .flatMap { case (alertSteps, _) => alertSteps.richAlert.getOrFail("Alert") }
           .map { richAlert =>
-            val alertWithObservables: (RichAlert, Seq[RichObservable]) = richAlert -> alertSrv.get(richAlert.alert).observables.richObservable.toList
+            val alertWithObservables: (RichAlert, Seq[RichObservable]) = richAlert -> alertSrv.get(richAlert.alert).observables.richObservable.toSeq
             Results.Ok(alertWithObservables.toJson)
           }
       }
@@ -175,7 +184,7 @@ class AlertCtrl @Inject() (
           alert <- alertSrv
             .get(alertId)
             .can(Permissions.manageAlert)
-            .getOrFail()
+            .getOrFail("Alert")
           _ <- alertSrv.remove(alert)
         } yield Results.NoContent
       }
@@ -191,7 +200,7 @@ class AlertCtrl @Inject() (
               alert <- alertSrv
                 .get(alertId)
                 .can(Permissions.manageAlert)
-                .getOrFail()
+                .getOrFail("Alert")
               _ <- alertSrv.remove(alert)
             } yield ()
           }
@@ -202,10 +211,10 @@ class AlertCtrl @Inject() (
     entrypoint("merge alert with case")
       .authTransaction(db) { implicit request => implicit graph =>
         for {
-          alert    <- alertSrv.get(alertId).can(Permissions.manageAlert).getOrFail()
-          case0    <- caseSrv.get(caseId).can(Permissions.manageCase).getOrFail()
+          alert    <- alertSrv.get(alertId).can(Permissions.manageAlert).getOrFail("Alert")
+          case0    <- caseSrv.get(caseId).can(Permissions.manageCase).getOrFail("Case")
           _        <- alertSrv.mergeInCase(alert, case0)
-          richCase <- caseSrv.get(caseId).richCase.getOrFail()
+          richCase <- caseSrv.get(caseId).richCase.getOrFail("Case")
         } yield Results.Ok(richCase.toJson)
       }
 
@@ -217,15 +226,15 @@ class AlertCtrl @Inject() (
         val alertIds: Seq[String] = request.body("alertIds")
         val caseId: String        = request.body("caseId")
         for {
-          case0 <- caseSrv.get(caseId).can(Permissions.manageCase).getOrFail()
+          case0 <- caseSrv.get(caseId).can(Permissions.manageCase).getOrFail("Case")
           _ <- alertIds.toTry { alertId =>
             alertSrv
               .get(alertId)
               .can(Permissions.manageAlert)
-              .getOrFail()
+              .getOrFail("Alert")
               .flatMap(alertSrv.mergeInCase(_, case0))
           }
-          richCase <- caseSrv.get(caseId).richCase.getOrFail()
+          richCase <- caseSrv.get(caseId).richCase.getOrFail("Case")
         } yield Results.Ok(richCase.toJson)
       }
 
@@ -235,7 +244,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .existsOrFail()
+          .existsOrFail
           .map { _ =>
             alertSrv.markAsRead(alertId)
             Results.NoContent
@@ -248,7 +257,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .existsOrFail()
+          .existsOrFail
           .map { _ =>
             alertSrv.markAsUnread(alertId)
             Results.NoContent
@@ -277,7 +286,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .existsOrFail()
+          .existsOrFail
           .map { _ =>
             alertSrv.followAlert(alertId)
             Results.NoContent
@@ -290,7 +299,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .existsOrFail()
+          .existsOrFail
           .map { _ =>
             alertSrv.unfollowAlert(alertId)
             Results.NoContent
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AttachmentCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/AttachmentCtrl.scala
index 05c01f930a..f7aee5c2dc 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AttachmentCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AttachmentCtrl.scala
@@ -11,8 +11,9 @@ import org.thp.scalligraph.NotFoundError
 import org.thp.scalligraph.controllers.Entrypoint
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.controllers.HttpHeaderParameterEncoding
+import org.thp.thehive.services.AttachmentOps._
 import org.thp.thehive.services.AttachmentSrv
 import play.api.http.HttpEntity
 import play.api.mvc._
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AuditCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/AuditCtrl.scala
index 9a06329de6..7ca8c0e78e 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AuditCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AuditCtrl.scala
@@ -7,10 +7,11 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Schema}
 import org.thp.scalligraph.query.{ParamQuery, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
-import org.thp.thehive.models.RichAudit
+import org.thp.thehive.models.{Audit, RichAudit}
+import org.thp.thehive.services.AuditOps._
 import org.thp.thehive.services.FlowActor.{AuditIds, FlowId}
 import org.thp.thehive.services._
 import play.api.libs.json.{JsArray, JsObject, Json}
@@ -36,7 +37,7 @@ class AuditCtrl @Inject() (
 
   implicit val timeout: Timeout = Timeout(5.minutes)
 
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, AuditSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Audit]](
     "getAudit",
     FieldsParser[IdOrName],
     (param, graph, authContext) => auditSrv.get(param.idOrName)(graph).visible(authContext)
@@ -45,16 +46,16 @@ class AuditCtrl @Inject() (
   override val entityName: String = "audit"
 
   override val initialQuery: Query =
-    Query.init[AuditSteps]("listAudit", (graph, authContext) => auditSrv.initSteps(graph).visible(authContext))
-  override val publicProperties: List[org.thp.scalligraph.query.PublicProperty[_, _]] = properties.audit ::: metaProperties[LogSteps]
+    Query.init[Traversal.V[Audit]]("listAudit", (graph, authContext) => auditSrv.startTraversal(graph).visible(authContext))
+  override val publicProperties: List[org.thp.scalligraph.query.PublicProperty[_, _]] = properties.audit
 
   override val pageQuery: ParamQuery[org.thp.thehive.controllers.v0.OutputParam] =
-    Query.withParam[OutputParam, AuditSteps, PagedResult[RichAudit]](
+    Query.withParam[OutputParam, Traversal.V[Audit], IteratorOutput](
       "page",
       FieldsParser[OutputParam],
       (range, auditSteps, _) => auditSteps.richPage(range.from, range.to, withTotal = true)(_.richAudit)
     )
-  override val outputQuery: Query = Query.output[RichAudit, AuditSteps](_.richAudit)
+  override val outputQuery: Query = Query.output[RichAudit, Traversal.V[Audit]](_.richAudit)
 
   def flow(caseId: Option[String]): Action[AnyContent] =
     entryPoint("audit flow")
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala b/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala
index 4f2c50ba4a..fdd7ee4e49 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala
@@ -1,112 +1,123 @@
 package org.thp.thehive.controllers.v0
 
-import java.lang.{Long => JLong}
-import java.util.{Map => JMap}
+import java.util.{Date, Map => JMap}
 
-import gremlin.scala.{__, By, Graph, Key, Vertex}
-import org.thp.scalligraph.models.UniMapping
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps._
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.thp.scalligraph.models.UMapping
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal._
 import org.thp.thehive.controllers.v0.Conversion._
+import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.AuditOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services._
 import play.api.libs.json.{JsNumber, JsObject, JsString}
 
-import scala.collection.JavaConverters._
-
 trait AuditRenderer {
 
-  def caseToJson: VertexSteps[_ <: Product] => Traversal[JsObject, JsObject] =
-    _.asCase.richCaseWithoutPerms.map[JsObject](_.toJson.as[JsObject])
+  def caseToJson: Traversal.V[Case] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    _.richCaseWithoutPerms.domainMap[JsObject](_.toJson.as[JsObject])
 
-  def taskToJson: VertexSteps[_ <: Product] => Traversal[JsObject, JsObject] = entitySteps => {
-    val taskSteps = entitySteps.asTask
-    taskSteps
-      .project(
-        _.by(_.richTask.map(_.toJson))
-          .by(t => caseToJson(t.`case`))
-      )
-      .map {
-        case (task, case0) => task.as[JsObject] + ("case" -> case0)
-      }
-  }
+  def taskToJson: Traversal.V[Task] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    _.project(
+      _.by(_.richTask.domainMap(_.toJson))
+        .by(t => caseToJson(t.`case`))
+    ).domainMap {
+      case (task, case0) => task.as[JsObject] + ("case" -> case0)
+    }
 
-  def alertToJson: VertexSteps[_ <: Product] => Traversal[JsObject, JsObject] =
-    _.asAlert.richAlert.map(_.toJson.as[JsObject])
+  def alertToJson: Traversal.V[Alert] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    _.richAlert.domainMap(_.toJson.as[JsObject])
 
-  def logToJson: VertexSteps[_ <: Product] => Traversal[JsObject, JsObject] =
-    _.asLog
-      .project(
-        _.by(_.richLog.map(_.toJson))
-          .by(l => taskToJson(l.task))
-      )
-      .map { case (log, task) => log.as[JsObject] + ("case_task" -> task) }
+  def logToJson: Traversal.V[Log] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    _.project(
+      _.by(_.richLog.domainMap(_.toJson))
+        .by(l => taskToJson(l.task))
+    ).domainMap { case (log, task) => log.as[JsObject] + ("case_task" -> task) }
 
-  def observableToJson: VertexSteps[_ <: Product] => Traversal[JsObject, JsObject] =
-    _.asObservable
-      .project(
-        _.by(_.richObservable.map(_.toJson))
-          .by(_.coalesce(o => caseToJson(o.`case`), o => alertToJson(o.alert)))
-      )
-      .map {
-        case (obs, caseOrAlert) => obs.as[JsObject] + ((caseOrAlert \ "_type").asOpt[String].getOrElse("???") -> caseOrAlert)
-      }
+  def observableToJson: Traversal.V[Observable] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    _.project(
+      _.by(_.richObservable.domainMap(_.toJson))
+        .by(_.coalesce(o => caseToJson(o.`case`), o => alertToJson(o.alert)))
+    ).domainMap {
+      case (obs, caseOrAlert) => obs.as[JsObject] + ((caseOrAlert \ "_type").asOpt[String].getOrElse("<unknwon>") -> caseOrAlert)
+    }
 
-  def jobToJson: VertexSteps[_ <: Product] => Traversal[JsObject, JsObject] = { s =>
-    val db = s.db
-    Traversal {
-      s.raw.map { vertex =>
+  case class Job(
+      workerId: String,
+      workerName: String,
+      workerDefinition: String,
+      status: String,
+      startDate: Date,
+      endDate: Date,
+      report: Option[JsObject],
+      cortexId: String,
+      cortexJobId: String
+  )
+  def jobToJson
+      : Traversal[Vertex, Vertex, IdentityConverter[Vertex]] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    _.project(
+      _.by.by
+    ).domainMap {
+      case (vertex, _) =>
         JsObject(
-          db.getOptionProperty(vertex, "workerId", UniMapping.string.optional).map(v => "analyzerId"                   -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "workerName", UniMapping.string.optional).map(v => "analyzerName"             -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "workerDefinition", UniMapping.string.optional).map(v => "analyzerDefinition" -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "status", UniMapping.string.optional).map(v => "status"                       -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "startDate", UniMapping.date.optional).map(v => "startDate"                   -> JsNumber(v.getTime)).toList :::
-            db.getOptionProperty(vertex, "endDate", UniMapping.date.optional).map(v => "endDate"                       -> JsNumber(v.getTime)).toList :::
-            db.getOptionProperty(vertex, "cortexId", UniMapping.string.optional).map(v => "cortexId"                   -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "cortexJobId", UniMapping.string.optional).map(v => "cortexJobId"             -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "_createdBy", UniMapping.string.optional).map(v => "_createdBy"               -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "_createdAt", UniMapping.date.optional).map(v => "_createdAt"                 -> JsNumber(v.getTime)).toList :::
-            db.getOptionProperty(vertex, "_updatedBy", UniMapping.string.optional).map(v => "_updatedBy"               -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "_updatedAt", UniMapping.date.optional).map(v => "_updatedAt"                 -> JsNumber(v.getTime)).toList :::
-            db.getOptionProperty(vertex, "_type", UniMapping.string.optional).map(v => "_type"                         -> JsString(v)).toList :::
-            db.getOptionProperty(vertex, "_id", UniMapping.string.optional).map(v => "_id"                             -> JsString(v)).toList
+          UMapping.string.optional.getProperty(vertex, "workerId").map(v => "analyzerId"                   -> JsString(v)).toList :::
+            UMapping.string.optional.getProperty(vertex, "workerName").map(v => "analyzerName"             -> JsString(v)).toList :::
+            UMapping.string.optional.getProperty(vertex, "workerDefinition").map(v => "analyzerDefinition" -> JsString(v)).toList :::
+            UMapping.string.optional.getProperty(vertex, "status").map(v => "status"                       -> JsString(v)).toList :::
+            UMapping.date.optional.getProperty(vertex, "startDate").map(v => "startDate"                   -> JsNumber(v.getTime)).toList :::
+            UMapping.date.optional.getProperty(vertex, "endDate").map(v => "endDate"                       -> JsNumber(v.getTime)).toList :::
+            UMapping.string.optional.getProperty(vertex, "cortexId").map(v => "cortexId"                   -> JsString(v)).toList :::
+            UMapping.string.optional.getProperty(vertex, "cortexJobId").map(v => "cortexJobId"             -> JsString(v)).toList :::
+            UMapping.string.optional.getProperty(vertex, "_createdBy").map(v => "_createdBy"               -> JsString(v)).toList :::
+            UMapping.date.optional.getProperty(vertex, "_createdAt").map(v => "_createdAt"                 -> JsNumber(v.getTime)).toList :::
+            UMapping.string.optional.getProperty(vertex, "_updatedBy").map(v => "_updatedBy"               -> JsString(v)).toList :::
+            UMapping.date.optional.getProperty(vertex, "_updatedAt").map(v => "_updatedAt"                 -> JsNumber(v.getTime)).toList :::
+            UMapping.string.optional.getProperty(vertex, "_type").map(v => "_type"                         -> JsString(v)).toList :::
+            UMapping.string.optional.getProperty(vertex, "_id").map(v => "_id"                             -> JsString(v)).toList
         )
-      }
     }
-  }
 
-  def auditRenderer: AuditSteps => Traversal[JsObject, JsObject] =
-    (_: AuditSteps)
-      .coalesce[JsObject](
-        _.`object` //.outTo[Audited]
+  def auditRenderer: Traversal.V[Audit] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    (_: Traversal.V[Audit])
+      .coalesce(
+        _.`object` //.out[Audited]
           .choose(
-            on = _.label,
-            BranchCase("Case", caseToJson),
-            BranchCase("Task", taskToJson),
-            BranchCase("Log", logToJson),
-            BranchCase("Observable", observableToJson),
-            BranchCase("Alert", alertToJson),
-            BranchCase("Job", jobToJson),
-            BranchOtherwise(_.constant(JsObject.empty))
+            _.on(_.label)
+              .option("Case", t => caseToJson(t.v[Case]))
+              .option("Task", t => taskToJson(t.v[Task]))
+              .option("Log", t => logToJson(t.v[Log]))
+              .option("Observable", t => observableToJson(t.v[Observable]))
+              .option("Alert", t => alertToJson(t.v[Alert]))
+              .option("Job", jobToJson)
+              .none(_.constant2[JsObject, JMap[String, Any]](JsObject.empty))
           ),
-        _.constant(JsObject.empty)
+        _.constant2[JsObject, JMap[String, Any]](JsObject.empty)
       )
 
   def jsonSummary(auditSrv: AuditSrv, requestId: String)(implicit graph: Graph): JsObject =
     auditSrv
-      .initSteps
+      .startTraversal
       .has("requestId", requestId)
       .has("mainAction", false)
-      .groupBy(By(Key[String]("objectType")), By(__[Vertex].groupCount(By(Key[String]("action")))))
-      .headOption()
-      .fold(JsObject.empty) { m: JMap[String, java.util.Collection[JMap[String, JLong]]] =>
+      .group(
+        _.byValue(_.objectType),
+        _.by(_.groupCount(_.byValue(_.action)))
+      )
+      .headOption
+      .fold(JsObject.empty) { m =>
         JsObject(
-          m.asInstanceOf[JMap[String, JMap[String, JLong]]]
-            .asScala
-            .map {
-              case (o, ac) =>
-                fromObjectType(o) -> JsObject(ac.asScala.map { case (a, c) => actionToOperation(a) -> JsNumber(c.toLong) }.toSeq)
-            }
+          m.map {
+            case (o, ac) =>
+              fromObjectType(o) -> JsObject(ac.map {
+                case (a, c) =>
+                  actionToOperation(a) -> JsNumber(c)
+              })
+          }
         )
       }
 
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AuthenticationCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/AuthenticationCtrl.scala
index 84fb90d5bd..8455440b90 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AuthenticationCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AuthenticationCtrl.scala
@@ -5,14 +5,14 @@ import org.thp.scalligraph.AuthorizationError
 import org.thp.scalligraph.auth.{AuthSrv, RequestOrganisation}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.controllers.v0.Conversion._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services.UserSrv
 import play.api.mvc.{Action, AnyContent, Results}
 
 import scala.concurrent.ExecutionContext
 import scala.util.{Failure, Success}
-
 @Singleton
 class AuthenticationCtrl @Inject() (
     entrypoint: Entrypoint,
@@ -42,7 +42,7 @@ class AuthenticationCtrl @Inject() (
             authContext <- authSrv.authenticate(login, password, organisation, code)
             user        <- db.roTransaction(userSrv.getOrFail(authContext.userId)(_))
             _           <- if (user.locked) Failure(AuthorizationError("Your account is locked")) else Success(())
-            body = organisation.flatMap(userSrv.get(user).richUser(_).headOption()).fold(user.toJson)(_.toJson)
+            body = organisation.flatMap(userSrv.get(user).richUser(_).headOption).fold(user.toJson)(_.toJson)
           } yield authSrv.setSessionUser(authContext)(Results.Ok(body))
         }
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala
index 8492b74626..260ec8306d 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala
@@ -4,12 +4,16 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.scalligraph.{RichSeq, _}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.{InputCase, InputTask}
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.Logger
 import play.api.libs.json.{JsArray, JsNumber, JsObject}
@@ -20,43 +24,43 @@ import scala.util.Success
 @Singleton
 class CaseCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     caseSrv: CaseSrv,
     caseTemplateSrv: CaseTemplateSrv,
     tagSrv: TagSrv,
     userSrv: UserSrv,
-    organisationSrv: OrganisationSrv
+    organisationSrv: OrganisationSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl
     with CaseRenderer {
 
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "case"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.`case` ::: metaProperties[CaseSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.`case`
   override val initialQuery: Query =
-    Query.init[CaseSteps]("listCase", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).cases)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, CaseSteps](
+    Query.init[Traversal.V[Case]]("listCase", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).cases)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Case]](
     "getCase",
     FieldsParser[IdOrName],
     (param, graph, authContext) => caseSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, CaseSteps, PagedResult[(RichCase, JsObject)]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Case], IteratorOutput](
     "page",
     FieldsParser[OutputParam], {
       case (OutputParam(from, to, withStats, _), caseSteps, authContext) =>
         caseSteps
           .richPage(from, to, withTotal = true) {
             case c if withStats =>
-              c.richCaseWithCustomRenderer(caseStatsRenderer(authContext, db, caseSteps.graph))(authContext)
+              c.richCaseWithCustomRenderer(caseStatsRenderer(authContext))(authContext)
             case c =>
-              c.richCase(authContext).map(_ -> JsObject.empty)
+              c.richCase(authContext).domainMap(_ -> JsObject.empty)
           }
     }
   )
-  override val outputQuery: Query = Query.outputWithContext[RichCase, CaseSteps]((caseSteps, authContext) => caseSteps.richCase(authContext))
+  override val outputQuery: Query = Query.outputWithContext[RichCase, Traversal.V[Case]]((caseSteps, authContext) => caseSteps.richCase(authContext))
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[CaseSteps, ObservableSteps]("observables", (caseSteps, authContext) => caseSteps.observables(authContext)),
-    Query[CaseSteps, TaskSteps]("tasks", (caseSteps, authContext) => caseSteps.tasks(authContext))
+    Query[Traversal.V[Case], Traversal.V[Observable]]("observables", (caseSteps, authContext) => caseSteps.observables(authContext)),
+    Query[Traversal.V[Case], Traversal.V[Task]]("tasks", (caseSteps, authContext) => caseSteps.tasks(authContext))
   )
 
   def create: Action[AnyContent] =
@@ -100,14 +104,14 @@ class CaseCtrl @Inject() (
           .visible
         val stats: Option[Boolean] = request.body("stats")
         if (stats.contains(true)) {
-          c.richCaseWithCustomRenderer(caseStatsRenderer(request, db, graph))
-            .getOrFail()
+          c.richCaseWithCustomRenderer(caseStatsRenderer(request))
+            .getOrFail("Case")
             .map {
               case (richCase, stats) => Results.Ok(richCase.toJson.as[JsObject] + ("stats" -> stats))
             }
         } else {
           c.richCase
-            .getOrFail()
+            .getOrFail("Case")
             .map(richCase => Results.Ok(richCase.toJson))
         }
       }
@@ -127,7 +131,7 @@ class CaseCtrl @Inject() (
             case (caseSteps, _) =>
               caseSteps
                 .richCase
-                .getOrFail()
+                .getOrFail("Case")
                 .map(richCase => Results.Ok(richCase.toJson))
           }
       }
@@ -150,7 +154,7 @@ class CaseCtrl @Inject() (
                 case (caseSteps, _) =>
                   caseSteps
                     .richCase
-                    .getOrFail()
+                    .getOrFail("Case")
               }
           }
           .map(richCases => Results.Ok(richCases.toJson))
@@ -162,7 +166,8 @@ class CaseCtrl @Inject() (
         caseSrv
           .get(caseIdOrNumber)
           .can(Permissions.manageCase)
-          .update("status" -> CaseStatus.Deleted)
+          .update(_.status, CaseStatus.Deleted)
+          .getOrFail("Case")
           .map(_ => Results.NoContent)
       }
 
@@ -173,7 +178,7 @@ class CaseCtrl @Inject() (
           c <- caseSrv
             .get(caseIdOrNumber)
             .can(Permissions.manageCase)
-            .getOrFail()
+            .getOrFail("Case")
           _ <- caseSrv.remove(c)
         } yield Results.NoContent
       }
@@ -188,7 +193,7 @@ class CaseCtrl @Inject() (
             caseSrv
               .get(_)
               .visible
-              .getOrFail()
+              .getOrFail("Case")
           )
           .map { cases =>
             val mergedCase = caseSrv.merge(cases)
diff --git a/thehive/app/org/thp/thehive/controllers/v0/CaseRenderer.scala b/thehive/app/org/thp/thehive/controllers/v0/CaseRenderer.scala
index 44a985b591..5b56c2f48e 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/CaseRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/CaseRenderer.scala
@@ -1,97 +1,83 @@
 package org.thp.thehive.controllers.v0
 
 import java.lang.{Long => JLong}
+import java.util.{Collection => JCollection, List => JList, Map => JMap}
 
-import gremlin.scala.{By, Graph, Key}
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
+import org.thp.scalligraph.traversal.Converter.CList
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, IdentityConverter, Traversal}
 import org.thp.thehive.models._
-import org.thp.thehive.services.{CaseSteps, ShareSteps}
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
 import play.api.libs.json._
 
-import scala.collection.JavaConverters._
-
 trait CaseRenderer {
 
-  def observableStats(
-      shareSteps: ShareSteps
-  )(implicit db: Database, graph: Graph): Traversal[JsObject, JsObject] =
-    shareSteps
-      .observables
+  def observableStats: Traversal.V[Share] => Traversal[JsObject, JLong, Converter[JsObject, JLong]] =
+    _.observables
       .count
-      .map(count => Json.obj("count" -> count))
+      .domainMap(count => Json.obj("count" -> count))
 
-  def taskStats(shareSteps: ShareSteps)(implicit db: Database, graph: Graph): Traversal[JsObject, JsObject] =
-    shareSteps
-      .tasks
+  def taskStats: Traversal.V[Share] => Traversal[JsObject, JMap[String, JLong], Converter[JsObject, JMap[String, JLong]]] =
+    _.tasks
       .active
-      .groupCount(By(Key[String]("status")))
-      .map { statusAgg =>
-        val (total, result) = statusAgg.asScala.foldLeft(0L -> JsObject.empty) {
-          case ((t, r), (k, v)) => (t + v) -> (r + (k -> JsNumber(v.toInt)))
+      .groupCount(_.byValue(_.status))
+      .domainMap { statusAgg =>
+        val (total, result) = statusAgg.foldLeft(0L -> JsObject.empty) {
+          case ((t, r), (k, v)) => (t + v) -> (r + (k.toString -> JsNumber(v.toInt)))
         }
         result + ("total" -> JsNumber(total))
       }
 
-  def alertStats(caseSteps: CaseSteps): Traversal[Seq[JsObject], Seq[JsObject]] =
-    caseSteps
-      .inTo[AlertCase]
-      .group(By(Key[String]("type")), By(Key[String]("source")))
-      .map { alertAgg =>
-        alertAgg
-          .asScala
-          .flatMap {
-            case (tpe, listOfSource) =>
-              listOfSource.asScala.map(s => Json.obj("type" -> tpe, "source" -> s))
-          }
-          .toSeq
+  def alertStats: Traversal.V[Case] => Traversal[Seq[JsObject], JMap[String, JCollection[String]], Converter[Seq[JsObject], JMap[String, JCollection[
+    String
+  ]]]] =
+    _.in[AlertCase]
+      .v[Alert]
+      .group(_.byValue(_.`type`), _.byValue(_.source))
+      .domainMap { alertAgg =>
+        (for {
+          (tpe, sources) <- alertAgg
+          source         <- sources
+        } yield Json.obj("type" -> tpe, "source" -> source)).toSeq
       }
-  // seq({caseId, title})
 
-  def mergeFromStats(caseSteps: CaseSteps): Traversal[JsValue, JsValue] = caseSteps.constant(JsNull)
+  def mergeFromStats: Traversal.V[Case] => Traversal[JsNull.type, JsNull.type, IdentityConverter[JsNull.type]] = _.constant(JsNull)
 
-  def mergeIntoStats(caseSteps: CaseSteps): Traversal[JsValue, JsValue] = caseSteps.constant(JsNull)
+  def mergeIntoStats: Traversal.V[Case] => Traversal[JsNull.type, JsNull.type, IdentityConverter[JsNull.type]] = _.constant(JsNull)
 
-  def sharedWithStats(
-      caseSteps: CaseSteps
-  )(implicit db: Database, graph: Graph): Traversal[Seq[String], Seq[String]] =
-    caseSteps.organisations.name.fold.map(_.asScala.toSeq)
+  def sharedWithStats: Traversal.V[Case] => Traversal[Seq[String], JList[String], CList[String, String, Converter[String, String]]] =
+    _.organisations.value(_.name).fold
 
-  def originStats(caseSteps: CaseSteps)(implicit db: Database, graph: Graph): Traversal[String, String] =
-    caseSteps.origin.name
+  def originStats: Traversal.V[Case] => Traversal[String, String, Converter[String, String]] = _.origin.value(_.name)
 
-  def shareCountStats(caseSteps: CaseSteps)(implicit db: Database, graph: Graph): Traversal[Long, JLong] =
-    caseSteps.organisations.count
+  def shareCountStats: Traversal.V[Case] => Traversal[Long, JLong, Converter[Long, JLong]] = _.organisations.count
 
-  def isOwnerStats(
-      caseSteps: CaseSteps
-  )(implicit db: Database, graph: Graph, authContext: AuthContext): Traversal[Boolean, Boolean] =
-    caseSteps.origin.name.map(_ == authContext.organisation)
+  def isOwnerStats(implicit authContext: AuthContext): Traversal.V[Case] => Traversal[Boolean, String, Converter[Boolean, String]] =
+    _.origin.value(_.name).domainMap(_ == authContext.organisation)
 
   def caseStatsRenderer(
-      implicit authContext: AuthContext,
-      db: Database,
-      graph: Graph
-  ): CaseSteps => Traversal[JsObject, JsObject] =
+      implicit authContext: AuthContext
+  ): Traversal.V[Case] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
     _.project(
       _.by(
-        (_: CaseSteps).coalesce(
+        (_: Traversal.V[Case]).coalesce(
           _.share.project(
-            _.by(taskStats(_))
-              .by(observableStats(_))
+            _.by(taskStats)
+              .by(observableStats)
           ),
-          _.constant((JsObject.empty, JsObject.empty))
+          _.constant2[(JsObject, JsObject), JMap[String, Any]](JsObject.empty -> JsObject.empty)
         )
-      ).by(alertStats(_))
-        .by(mergeFromStats(_))
-        .by(mergeIntoStats(_))
+      ).by(alertStats)
+        .by(mergeFromStats)
+        .by(mergeIntoStats)
         //        .by(sharedWithStats(_))
         //        .by(originStats(_))
-        .by(isOwnerStats(_))
-        .by(shareCountStats(_))
-    ).map {
+        .by(isOwnerStats)
+        .by(shareCountStats)
+    ).domainMap {
       case ((tasks, observables), alerts, mergeFrom, mergeInto, isOwner, shareCount) =>
         Json.obj(
           "tasks"      -> tasks,
diff --git a/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala
index f61e5b9209..dab4b233d4 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala
@@ -5,42 +5,45 @@ import org.thp.scalligraph.RichSeq
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputCaseTemplate
-import org.thp.thehive.models.{Permissions, RichCaseTemplate}
+import org.thp.thehive.models.{CaseTemplate, Permissions, RichCaseTemplate}
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.Logger
 import play.api.mvc.{Action, AnyContent, Results}
-
 @Singleton
 class CaseTemplateCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     caseTemplateSrv: CaseTemplateSrv,
     organisationSrv: OrganisationSrv,
     userSrv: UserSrv,
-    auditSrv: AuditSrv
+    auditSrv: AuditSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
 
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "caseTemplate"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.caseTemplate ::: metaProperties[CaseTemplateSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.caseTemplate
   override val initialQuery: Query =
-    Query.init[CaseTemplateSteps]("listCaseTemplate", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).caseTemplates)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, CaseTemplateSteps](
+    Query
+      .init[Traversal.V[CaseTemplate]]("listCaseTemplate", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).caseTemplates)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[CaseTemplate]](
     "getCaseTemplate",
     FieldsParser[IdOrName],
     (param, graph, authContext) => caseTemplateSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, CaseTemplateSteps, PagedResult[RichCaseTemplate]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[CaseTemplate], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, caseTemplateSteps, _) => caseTemplateSteps.richPage(range.from, range.to, withTotal = true)(_.richCaseTemplate)
   )
-  override val outputQuery: Query = Query.output[RichCaseTemplate, CaseTemplateSteps](_.richCaseTemplate)
+  override val outputQuery: Query = Query.output[RichCaseTemplate, Traversal.V[CaseTemplate]](_.richCaseTemplate)
 
   def create: Action[AnyContent] =
     entrypoint("create case template")
@@ -50,7 +53,7 @@ class CaseTemplateCtrl @Inject() (
         val customFields                         = inputCaseTemplate.customFields.sortBy(_.order.getOrElse(0)).map(c => c.name -> c.value)
         for {
           tasks            <- inputCaseTemplate.tasks.toTry(t => t.owner.map(userSrv.getOrFail).flip.map(t.toTask -> _))
-          organisation     <- userSrv.current.organisations(Permissions.manageCaseTemplate).get(request.organisation).getOrFail()
+          organisation     <- userSrv.current.organisations(Permissions.manageCaseTemplate).get(request.organisation).getOrFail("CaseTemplate")
           richCaseTemplate <- caseTemplateSrv.create(inputCaseTemplate.toCaseTemplate, organisation, inputCaseTemplate.tags, tasks, customFields)
         } yield Results.Created(richCaseTemplate.toJson)
       }
@@ -62,7 +65,7 @@ class CaseTemplateCtrl @Inject() (
           .get(caseTemplateNameOrId)
           .visible
           .richCaseTemplate
-          .getOrFail()
+          .getOrFail("CaseTemplate")
           .map(richCaseTemplate => Results.Ok(richCaseTemplate.toJson))
       }
 
@@ -85,7 +88,7 @@ class CaseTemplateCtrl @Inject() (
       .authTransaction(db) { implicit request => implicit graph =>
         for {
           organisation <- organisationSrv.getOrFail(request.organisation)
-          template     <- caseTemplateSrv.get(caseTemplateNameOrId).can(Permissions.manageCaseTemplate).getOrFail()
+          template     <- caseTemplateSrv.get(caseTemplateNameOrId).can(Permissions.manageCaseTemplate).getOrFail("CaseTemplate")
           _ = caseTemplateSrv.get(template).remove()
           _ <- auditSrv.caseTemplate.delete(template, organisation)
         } yield Results.Ok
diff --git a/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala b/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala
index 8ea6715368..b260be6fb9 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala
@@ -11,9 +11,9 @@ import org.thp.thehive.models._
 import play.api.libs.json.{JsObject, JsValue, Json, Writes}
 
 object Conversion {
-  implicit class RendererOps[O, D](o: O)(implicit renderer: Renderer.Aux[O, D]) {
-    def toJson: JsValue = renderer.toOutput(o).toJson
-    def toValue: D      = renderer.toOutput(o).toValue
+  implicit class RendererOps[F, O](f: F)(implicit renderer: Renderer.Aux[F, O]) {
+    def toJson: JsValue = renderer.toOutput(f).toJson
+    def toValue: O      = renderer.toOutput(f).toValue
   }
 
   val adminPermissions: Set[Permission] = Set(Permissions.manageUser, Permissions.manageOrganisation)
@@ -34,7 +34,7 @@ object Conversion {
     case other        => other.toLowerCase()
   }
 
-  implicit val alertOutput: Renderer.Aux[RichAlert, OutputAlert] = Renderer.json[RichAlert, OutputAlert](richAlert =>
+  implicit val alertOutput: Renderer.Aux[RichAlert, OutputAlert] = Renderer.toJson[RichAlert, OutputAlert](richAlert =>
     richAlert
       .into[OutputAlert]
       .withFieldComputed(_.customFields, rc => JsObject(rc.customFields.map(cf => cf.name -> Json.obj(cf.typeName -> cf.toJson))))
@@ -59,7 +59,7 @@ object Conversion {
   )
 
   implicit val alertWithObservablesOutput: Renderer.Aux[(RichAlert, Seq[RichObservable]), OutputAlert] =
-    Renderer.json[(RichAlert, Seq[RichObservable]), OutputAlert](richAlertWithObservables =>
+    Renderer.toJson[(RichAlert, Seq[RichObservable]), OutputAlert](richAlertWithObservables =>
       richAlertWithObservables
         ._1
         .into[OutputAlert]
@@ -100,7 +100,7 @@ object Conversion {
         .transform
   }
 
-  implicit val attachmentOutput: Renderer.Aux[Attachment with Entity, OutputAttachment] = Renderer.json[Attachment with Entity, OutputAttachment](
+  implicit val attachmentOutput: Renderer.Aux[Attachment with Entity, OutputAttachment] = Renderer.toJson[Attachment with Entity, OutputAttachment](
     _.asInstanceOf[Attachment]
       .into[OutputAttachment]
       .withFieldComputed(_.hashes, _.hashes.map(_.toString).sortBy(_.length)(Ordering.Int.reverse))
@@ -108,7 +108,7 @@ object Conversion {
       .transform
   )
 
-  implicit val auditOutput: Renderer.Aux[RichAudit, OutputAudit] = Renderer.json[RichAudit, OutputAudit](
+  implicit val auditOutput: Renderer.Aux[RichAudit, OutputAudit] = Renderer.toJson[RichAudit, OutputAudit](
     _.into[OutputAudit]
       .withFieldComputed(_.operation, a => actionToOperation(a.action))
       .withFieldComputed(_.id, _._id)
@@ -119,17 +119,17 @@ object Conversion {
       .withFieldConst(_.base, true)
       .withFieldComputed(_.details, a => Json.parse(a.details.getOrElse("{}")).as[JsObject])
       .withFieldComputed(_.objectId, a => a.objectId.getOrElse(a.context._id))
-      .withFieldComputed(_.objectType, a => fromObjectType(a.objectType.getOrElse(a.context._model.label)))
+      .withFieldComputed(_.objectType, a => fromObjectType(a.objectType.getOrElse(a.context._label)))
       .withFieldComputed(_.rootId, _.context._id)
       .withFieldComputed(_.startDate, _._createdAt)
       .withFieldComputed(
         _.summary,
-        a => Map(fromObjectType(a.objectType.getOrElse(a.context._model.label)) -> Map(actionToOperation(a.action) -> 1))
+        a => Map(fromObjectType(a.objectType.getOrElse(a.context._label)) -> Map(actionToOperation(a.action) -> 1))
       )
       .transform
   )
 
-  implicit val caseOutput: Renderer.Aux[RichCase, OutputCase] = Renderer.json[RichCase, OutputCase](
+  implicit val caseOutput: Renderer.Aux[RichCase, OutputCase] = Renderer.toJson[RichCase, OutputCase](
     _.into[OutputCase]
       .withFieldComputed(
         _.customFields,
@@ -182,8 +182,8 @@ object Conversion {
       )
   }
 
-  implicit val caseWithStatsOutput: Renderer.Aux[(RichCase, JsObject), OutputCase] =
-    Renderer.json[(RichCase, JsObject), OutputCase](richCaseWithStats =>
+  implicit val caseWithStatsOutput: Renderer[(RichCase, JsObject)] =
+    Renderer.toJson[(RichCase, JsObject), OutputCase](richCaseWithStats =>
       richCaseWithStats
         ._1
         .into[OutputCase]
@@ -213,7 +213,7 @@ object Conversion {
         .transform
   }
 
-  implicit val caseTemplateOutput: Renderer.Aux[RichCaseTemplate, OutputCaseTemplate] = Renderer.json[RichCaseTemplate, OutputCaseTemplate](
+  implicit val caseTemplateOutput: Renderer.Aux[RichCaseTemplate, OutputCaseTemplate] = Renderer.toJson[RichCaseTemplate, OutputCaseTemplate](
     _.into[OutputCaseTemplate]
       .withFieldComputed(
         _.customFields,
@@ -232,15 +232,16 @@ object Conversion {
       .transform
   )
 
-  implicit val richCustomFieldOutput: Renderer.Aux[RichCustomField, OutputCustomFieldValue] = Renderer.json[RichCustomField, OutputCustomFieldValue](
-    _.into[OutputCustomFieldValue]
-      .withFieldComputed(_.value, _.value.map {
-        case d: Date => d.getTime.toString
-        case other   => other.toString
-      })
-      .withFieldComputed(_.tpe, _.typeName)
-      .transform
-  )
+  implicit val richCustomFieldOutput: Renderer.Aux[RichCustomField, OutputCustomFieldValue] =
+    Renderer.toJson[RichCustomField, OutputCustomFieldValue](
+      _.into[OutputCustomFieldValue]
+        .withFieldComputed(_.value, _.value.map {
+          case d: Date => d.getTime.toString
+          case other   => other.toString
+        })
+        .withFieldComputed(_.tpe, _.typeName)
+        .transform
+    )
 
   implicit class InputCustomFieldOps(inputCustomField: InputCustomField) {
 
@@ -255,7 +256,7 @@ object Conversion {
   }
 
   implicit val customFieldOutput: Renderer.Aux[CustomField with Entity, OutputCustomField] =
-    Renderer.json[CustomField with Entity, OutputCustomField](customField =>
+    Renderer.toJson[CustomField with Entity, OutputCustomField](customField =>
       customField
         .asInstanceOf[CustomField]
         .into[OutputCustomField]
@@ -266,7 +267,7 @@ object Conversion {
         .transform
     )
 
-  implicit val dashboardOutput: Renderer.Aux[RichDashboard, OutputDashboard] = Renderer.json[RichDashboard, OutputDashboard](dashboard =>
+  implicit val dashboardOutput: Renderer.Aux[RichDashboard, OutputDashboard] = Renderer.toJson[RichDashboard, OutputDashboard](dashboard =>
     dashboard
       .into[OutputDashboard]
       .withFieldConst(_.id, dashboard._id)
@@ -290,7 +291,7 @@ object Conversion {
         .transform
   }
 
-  implicit val logOutput: Renderer.Aux[RichLog, OutputLog] = Renderer.json[RichLog, OutputLog](richLog =>
+  implicit val logOutput: Renderer.Aux[RichLog, OutputLog] = Renderer.toJson[RichLog, OutputLog](richLog =>
     richLog
       .into[OutputLog]
       .withFieldConst(_._type, "case_task_log")
@@ -332,7 +333,7 @@ object Conversion {
   implicit val reportTagWrites: Writes[ReportTag] = Writes[ReportTag] { tag =>
     Json.obj("level" -> tag.level.toString, "namespace" -> tag.namespace, "predicate" -> tag.predicate, "value" -> tag.value)
   }
-  implicit val observableOutput: Renderer.Aux[RichObservable, OutputObservable] = Renderer.json[RichObservable, OutputObservable](
+  implicit val observableOutput: Renderer.Aux[RichObservable, OutputObservable] = Renderer.toJson[RichObservable, OutputObservable](
     _.into[OutputObservable]
       .withFieldConst(_._type, "case_artifact")
       .withFieldComputed(_.id, _.observable._id)
@@ -368,7 +369,7 @@ object Conversion {
   )
 
   implicit val observableWithExtraOutput: Renderer.Aux[(RichObservable, JsObject, Option[RichCase]), OutputObservable] =
-    Renderer.json[(RichObservable, JsObject, Option[RichCase]), OutputObservable] {
+    Renderer.toJson[(RichObservable, JsObject, Option[RichCase]), OutputObservable] {
       case (richObservable, stats, richCase) =>
         richObservable
           .into[OutputObservable]
@@ -401,7 +402,7 @@ object Conversion {
     }
 
   implicit val observableWithStatsOutput: Renderer.Aux[(RichObservable, JsObject), OutputObservable] =
-    Renderer.json[(RichObservable, JsObject), OutputObservable] {
+    Renderer.toJson[(RichObservable, JsObject), OutputObservable] {
       case (richObservable, stats) =>
         richObservable
           .into[OutputObservable]
@@ -442,7 +443,7 @@ object Conversion {
   }
 
   implicit val organisationOutput: Renderer.Aux[Organisation with Entity, OutputOrganisation] =
-    Renderer.json[Organisation with Entity, OutputOrganisation](organisation =>
+    Renderer.toJson[Organisation with Entity, OutputOrganisation](organisation =>
       OutputOrganisation(
         organisation.name,
         organisation.description,
@@ -458,7 +459,7 @@ object Conversion {
     )
 
   implicit val richOrganisationOutput: Renderer.Aux[RichOrganisation, OutputOrganisation] =
-    Renderer.json[RichOrganisation, OutputOrganisation](organisation =>
+    Renderer.toJson[RichOrganisation, OutputOrganisation](organisation =>
       OutputOrganisation(
         organisation.name,
         organisation.description,
@@ -473,7 +474,7 @@ object Conversion {
       )
     )
 
-  implicit val profileOutput: Renderer.Aux[Profile with Entity, OutputProfile] = Renderer.json[Profile with Entity, OutputProfile](profile =>
+  implicit val profileOutput: Renderer.Aux[Profile with Entity, OutputProfile] = Renderer.toJson[Profile with Entity, OutputProfile](profile =>
     profile
       .asInstanceOf[Profile]
       .into[OutputProfile]
@@ -499,7 +500,7 @@ object Conversion {
         .transform
   }
 
-  implicit val shareOutput: Renderer.Aux[RichShare, OutputShare] = Renderer.json[RichShare, OutputShare](
+  implicit val shareOutput: Renderer.Aux[RichShare, OutputShare] = Renderer.toJson[RichShare, OutputShare](
     _.into[OutputShare]
       .withFieldComputed(_._id, _.share._id)
       .withFieldComputed(_.createdAt, _.share._createdAt)
@@ -507,7 +508,7 @@ object Conversion {
       .transform
   )
 
-  implicit val tagOutput: Renderer.Aux[Tag with Entity, OutputTag] = Renderer.json[Tag with Entity, OutputTag](
+  implicit val tagOutput: Renderer.Aux[Tag with Entity, OutputTag] = Renderer.toJson[Tag with Entity, OutputTag](
     _.asInstanceOf[Tag]
       .into[OutputTag]
       .transform
@@ -525,7 +526,7 @@ object Conversion {
         .transform
   }
 
-  implicit val taskOutput: Renderer.Aux[RichTask, OutputTask] = Renderer.json[RichTask, OutputTask](
+  implicit val taskOutput: Renderer.Aux[RichTask, OutputTask] = Renderer.toJson[RichTask, OutputTask](
     _.into[OutputTask]
       .withFieldRenamed(_._id, _.id)
       .withFieldComputed(_.status, _.status.toString)
@@ -540,7 +541,7 @@ object Conversion {
   )
 
   implicit val taskWithParentOutput: Renderer.Aux[(RichTask, Option[RichCase]), OutputTask] =
-    Renderer.json[(RichTask, Option[RichCase]), OutputTask] {
+    Renderer.toJson[(RichTask, Option[RichCase]), OutputTask] {
       case (richTask, richCase) =>
         richTask
           .into[OutputTask]
@@ -570,7 +571,7 @@ object Conversion {
         .transform
   }
 
-  implicit val userOutput: Renderer.Aux[RichUser, OutputUser] = Renderer.json[RichUser, OutputUser](
+  implicit val userOutput: Renderer.Aux[RichUser, OutputUser] = Renderer.toJson[RichUser, OutputUser](
     _.into[OutputUser]
       .withFieldComputed(_.roles, u => permissions2Roles(u.permissions))
       .withFieldRenamed(_.login, _.id)
@@ -584,7 +585,7 @@ object Conversion {
       .transform
   )
 
-  implicit val simpleUserOutput: Renderer.Aux[User with Entity, OutputUser] = Renderer.json[User with Entity, OutputUser](u =>
+  implicit val simpleUserOutput: Renderer.Aux[User with Entity, OutputUser] = Renderer.toJson[User with Entity, OutputUser](u =>
     u.asInstanceOf[User]
       .into[OutputUser]
       .withFieldConst(_._id, u._id)
@@ -602,7 +603,7 @@ object Conversion {
       .transform
   )
 
-  implicit val pageOutput: Renderer.Aux[Page with Entity, OutputPage] = Renderer.json[Page with Entity, OutputPage](p =>
+  implicit val pageOutput: Renderer.Aux[Page with Entity, OutputPage] = Renderer.toJson[Page with Entity, OutputPage](p =>
     p.asInstanceOf[Page]
       .into[OutputPage]
       .withFieldConst(_._id, p._id)
@@ -618,10 +619,10 @@ object Conversion {
   )
 
   implicit val permissionOutput: Renderer.Aux[PermissionDesc, OutputPermission] =
-    Renderer.json[PermissionDesc, OutputPermission](_.into[OutputPermission].transform)
+    Renderer.toJson[PermissionDesc, OutputPermission](_.into[OutputPermission].transform)
 
   implicit val observableTypeOutput: Renderer.Aux[ObservableType with Entity, OutputObservableType] =
-    Renderer.json[ObservableType with Entity, OutputObservableType](ot =>
+    Renderer.toJson[ObservableType with Entity, OutputObservableType](ot =>
       ot.asInstanceOf[ObservableType]
         .into[OutputObservableType]
         .withFieldConst(_._id, ot._id)
diff --git a/thehive/app/org/thp/thehive/controllers/v0/CustomFieldCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/CustomFieldCtrl.scala
index f895be9342..c9cc10b532 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/CustomFieldCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/CustomFieldCtrl.scala
@@ -4,7 +4,7 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.PropertyUpdater
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputCustomField
 import org.thp.thehive.models.Permissions
@@ -36,8 +36,8 @@ class CustomFieldCtrl @Inject() (
     entrypoint("list custom fields")
       .authRoTransaction(db) { _ => implicit graph =>
         val customFields = customFieldSrv
-          .initSteps
-          .toList
+          .startTraversal
+          .toSeq
         Success(Results.Ok(customFields.toJson))
       }
 
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
index d8eead51aa..ed6196ff1c 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
@@ -4,48 +4,53 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputDashboard
-import org.thp.thehive.models.RichDashboard
-import org.thp.thehive.services.{DashboardSrv, DashboardSteps, OrganisationSrv, UserSrv}
+import org.thp.thehive.models.{Dashboard, RichDashboard}
+import org.thp.thehive.services.DashboardOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
+import org.thp.thehive.services.{DashboardSrv, OrganisationSrv, UserSrv}
 import play.api.mvc.{Action, AnyContent, Results}
 
 @Singleton
 class DashboardCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     dashboardSrv: DashboardSrv,
     organisationSrv: OrganisationSrv,
-    userSrv: UserSrv
+    userSrv: UserSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
   val entityName: String                           = "dashboard"
-  val publicProperties: List[PublicProperty[_, _]] = properties.dashboard ::: metaProperties[DashboardSteps]
+  val publicProperties: List[PublicProperty[_, _]] = properties.dashboard
 
   val initialQuery: Query =
-    Query.init[DashboardSteps](
+    Query.init[Traversal.V[Dashboard]](
       "listDashboard",
       (graph, authContext) =>
-        union(dashboardSrv)(
-          t => organisationSrv.steps(db.labelFilter(organisationSrv.model)(t))(graph).get(authContext.organisation).dashboards,
-          t => userSrv.steps(db.labelFilter(userSrv.model)(t))(graph).current(authContext).dashboards
-        )(graph).dedup
+        Traversal
+          .union(
+            organisationSrv.filterTraversal(_).get(authContext.organisation).dashboards,
+            userSrv.filterTraversal(_).get(authContext.userId).dashboards
+          )(graph)
+          .dedup
     )
 
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, DashboardSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Dashboard]](
     "getDashboard",
     FieldsParser[IdOrName],
     (param, graph, authContext) => dashboardSrv.get(param.idOrName)(graph).visible(authContext)
   )
 
-  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, DashboardSteps, PagedResult[RichDashboard]](
+  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Dashboard], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, dashboardSteps, _) => dashboardSteps.richPage(range.from, range.to, withTotal = true)(_.richDashboard)
   )
-  override val outputQuery: Query = Query.output[RichDashboard, DashboardSteps](_.richDashboard)
+  override val outputQuery: Query = Query.output[RichDashboard, Traversal.V[Dashboard]](_.richDashboard)
 
   def create: Action[AnyContent] =
     entrypoint("create dashboard")
@@ -62,7 +67,7 @@ class DashboardCtrl @Inject() (
           .getByIds(dashboardId)
           .visible
           .richDashboard
-          .getOrFail()
+          .getOrFail("Dashboard")
           .map(dashboard => Results.Ok(dashboard.toJson))
       }
 
@@ -73,7 +78,7 @@ class DashboardCtrl @Inject() (
         val propertyUpdaters: Seq[PropertyUpdater] = request.body("dashboard")
         dashboardSrv
           .update(_.getByIds(dashboardId).canUpdate, propertyUpdaters) // TODO check permission
-          .flatMap { case (dashboardSteps, _) => dashboardSteps.richDashboard.getOrFail() }
+          .flatMap { case (dashboardSteps, _) => dashboardSteps.richDashboard.getOrFail("Dashboard") }
           .map(dashboard => Results.Ok(dashboard.toJson))
       }
 
@@ -84,7 +89,7 @@ class DashboardCtrl @Inject() (
           .current
           .dashboards
           .getByIds(dashboardId)
-          .getOrFail()
+          .getOrFail("Dashboard")
           .map { dashboard =>
             dashboardSrv.remove(dashboard)
             Results.NoContent
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala
index 5d20de9394..a891d61be3 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala
@@ -10,7 +10,7 @@ import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.PublicProperty
 import org.thp.scalligraph.services.config.ApplicationConfig.durationFormat
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Hash
 import org.thp.thehive.services.CustomFieldSrv
 import play.api.Logger
@@ -87,8 +87,8 @@ class DescribeCtrl @Inject() (
   implicit val propertyDescriptionWrites: Writes[PropertyDescription] =
     Json.writes[PropertyDescription].transform((_: JsObject) + ("description" -> JsString("")))
 
-  def customFields: List[PropertyDescription] = db.roTransaction { implicit graph =>
-    customFieldSrv.initSteps.toList.map(cf => PropertyDescription(s"customFields.${cf.name}", cf.`type`.toString))
+  def customFields: Seq[PropertyDescription] = db.roTransaction { implicit graph =>
+    customFieldSrv.startTraversal.toSeq.map(cf => PropertyDescription(s"customFields.${cf.name}", cf.`type`.toString))
   }
 
   def customDescription(model: String, propertyName: String): Option[Seq[PropertyDescription]] = (model, propertyName) match {
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala
index aaa40847a3..90e6946cec 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala
@@ -3,11 +3,12 @@ package org.thp.thehive.controllers.v0
 import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Hasher
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputCustomField
 import org.thp.thehive.models.ObservableType
+import org.thp.thehive.services.CustomFieldOps._
 import org.thp.thehive.services.{CustomFieldSrv, ObservableTypeSrv}
 import play.api.libs.json.{JsObject, JsString, Json}
 import play.api.mvc.{Action, AnyContent, Results}
@@ -43,7 +44,7 @@ class ListCtrl @Inject() (
           case "custom_fields" =>
             val cf = db
               .roTransaction { implicit grap =>
-                customFieldSrv.initSteps.toList
+                customFieldSrv.startTraversal.toSeq
               }
               .map(cf => cf._id -> cf.toJson)
             JsObject(cf)
@@ -88,8 +89,8 @@ class ListCtrl @Inject() (
           case "custom_fields" =>
             val v: String = request.body("value")
             customFieldSrv
-              .initSteps
-              .get(v)
+              .startTraversal
+              .getByName(v)
               .getOrFail("CustomField")
               .map(f => Results.Conflict(Json.obj("found" -> f.toJson)))
               .orElse(Success(Results.Ok))
diff --git a/thehive/app/org/thp/thehive/controllers/v0/LogCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/LogCtrl.scala
index 490b75883e..9add39b69e 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/LogCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/LogCtrl.scala
@@ -4,12 +4,16 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputLog
-import org.thp.thehive.models.{Permissions, RichLog}
-import org.thp.thehive.services.{LogSrv, LogSteps, OrganisationSrv, TaskSrv}
+import org.thp.thehive.models.{Log, Permissions, RichLog}
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
+import org.thp.thehive.services.{LogSrv, OrganisationSrv, TaskSrv}
 import play.api.Logger
 import play.api.mvc.{Action, AnyContent, Results}
 
@@ -25,20 +29,20 @@ class LogCtrl @Inject() (
 
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "log"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.log ::: metaProperties[LogSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.log
   override val initialQuery: Query =
-    Query.init[LogSteps]("listLog", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks.logs)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, LogSteps](
+    Query.init[Traversal.V[Log]]("listLog", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks.logs)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Log]](
     "getLog",
     FieldsParser[IdOrName],
     (param, graph, authContext) => logSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, LogSteps, PagedResult[RichLog]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Log], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, logSteps, _) => logSteps.richPage(range.from, range.to, withTotal = true)(_.richLog)
   )
-  override val outputQuery: Query = Query.output[RichLog, LogSteps](_.richLog)
+  override val outputQuery: Query = Query.output[RichLog, Traversal.V[Log]](_.richLog)
 
   def create(taskId: String): Action[AnyContent] =
     entrypoint("create log")
@@ -49,7 +53,7 @@ class LogCtrl @Inject() (
           task <- taskSrv
             .getByIds(taskId)
             .can(Permissions.manageTask)
-            .getOrFail()
+            .getOrFail("Task")
           createdLog <- logSrv.create(inputLog.toLog, task)
           attachment <- inputLog.attachment.map(logSrv.addAttachment(createdLog, _)).flip
           richLog = RichLog(createdLog, attachment.toList)
@@ -74,7 +78,7 @@ class LogCtrl @Inject() (
     entrypoint("delete log")
       .authTransaction(db) { implicit req => implicit graph =>
         for {
-          log <- logSrv.get(logId).can(Permissions.manageTask).getOrFail()
+          log <- logSrv.get(logId).can(Permissions.manageTask).getOrFail("Log")
           _   <- logSrv.cascadeRemove(log)
         } yield Results.NoContent
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
index c948e4a5c2..cf8dc42997 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -5,11 +5,15 @@ import org.thp.scalligraph._
 import org.thp.scalligraph.controllers._
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputObservable
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
 import org.thp.thehive.services._
 import play.api.Logger
 import play.api.libs.json.JsObject
@@ -31,33 +35,39 @@ class ObservableCtrl @Inject() (
 
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "observable"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.observable ::: metaProperties[ObservableSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.observable
   override val initialQuery: Query =
-    Query.init[ObservableSteps]("listObservable", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.observables)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, ObservableSteps](
+    Query.init[Traversal.V[Observable]](
+      "listObservable",
+      (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.observables
+    )
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Observable]](
     "getObservable",
     FieldsParser[IdOrName],
     (param, graph, authContext) => observableSrv.get(param.idOrName)(graph).visible(authContext)
   )
   override val pageQuery: ParamQuery[OutputParam] =
-    Query.withParam[OutputParam, ObservableSteps, PagedResult[(RichObservable, JsObject, Option[RichCase])]](
+    Query.withParam[OutputParam, Traversal.V[Observable], IteratorOutput](
       "page",
       FieldsParser[OutputParam], {
         case (OutputParam(from, to, withStats, 0), observableSteps, authContext) =>
           observableSteps
             .richPage(from, to, withTotal = true) {
               case o if withStats =>
-                o.richObservableWithCustomRenderer(observableStatsRenderer(authContext)).map(ros => (ros._1, ros._2, None))
+                o.richObservableWithCustomRenderer(observableStatsRenderer(authContext))(authContext)
+                  .domainMap(ros => (ros._1, ros._2, None: Option[RichCase]))
               case o =>
-                o.richObservable.map(ro => (ro, JsObject.empty, None))
+                o.richObservable.domainMap(ro => (ro, JsObject.empty, None))
             }
         case (OutputParam(from, to, _, _), observableSteps, authContext) =>
           observableSteps.richPage(from, to, withTotal = true)(
-            _.richObservableWithCustomRenderer(o => o.`case`.richCase(authContext)).map(roc => (roc._1, JsObject.empty, Some(roc._2)))
+            _.richObservableWithCustomRenderer(o => o.`case`.richCase(authContext))(authContext).domainMap(roc =>
+              (roc._1, JsObject.empty, Some(roc._2): Option[RichCase])
+            )
           )
       }
     )
-  override val outputQuery: Query = Query.output[RichObservable, ObservableSteps](_.richObservable)
+  override val outputQuery: Query = Query.output[RichObservable, Traversal.V[Observable]](_.richObservable)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
 //    Query.output[(RichObservable, JsObject, Option[RichCase])]
   )
@@ -123,7 +133,7 @@ class ObservableCtrl @Inject() (
           .similar
           .visible
           .richObservableWithCustomRenderer(observableLinkRenderer)
-          .toList
+          .toSeq
 
         Success(Results.Ok(observables.toJson))
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableRenderer.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableRenderer.scala
index d0fe512837..ddbc076830 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableRenderer.scala
@@ -1,34 +1,39 @@
 package org.thp.thehive.controllers.v0
 
-import gremlin.scala.{By, Key}
+import java.lang.{Boolean => JBoolean, Long => JLong}
+import java.util.{Map => JMap}
+
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
+import org.thp.scalligraph.traversal.Traversal.V
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
-import org.thp.thehive.services.ObservableSteps
+import org.thp.thehive.models.Observable
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
 import play.api.libs.json.{JsObject, Json}
 
-import scala.collection.JavaConverters._
-
 trait ObservableRenderer {
 
-  def observableStatsRenderer(implicit authContext: AuthContext): ObservableSteps => Traversal[JsObject, JsObject] =
+  def observableStatsRenderer(
+      implicit authContext: AuthContext
+  ): Traversal.V[Observable] => Traversal[JsObject, JMap[JBoolean, JLong], Converter[JsObject, JMap[JBoolean, JLong]]] =
     _.similar
       .visible
-      .groupCount(By(Key[Boolean]("ioc")))
-      .map { stats =>
-        val m      = stats.asScala
-        val nTrue  = m.get(true).fold(0L)(_.toLong)
-        val nFalse = m.get(false).fold(0L)(_.toLong)
+      .groupCount(_.byValue(_.ioc))
+      .domainMap { stats =>
+        val nTrue  = stats.getOrElse(true, 0L)
+        val nFalse = stats.getOrElse(false, 0L)
         Json.obj(
           "seen" -> (nTrue + nFalse),
           "ioc"  -> (nTrue > 0)
         )
       }
 
-  def observableLinkRenderer: ObservableSteps => Traversal[JsObject, JsObject] =
+  def observableLinkRenderer: V[Observable] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
     _.coalesce(
-      _.alert.richAlert.map(a => Json.obj("alert"            -> a.toJson)),
-      _.`case`.richCaseWithoutPerms.map(c => Json.obj("case" -> c.toJson))
+      _.alert.richAlert.domainMap(a => Json.obj("alert"            -> a.toJson)),
+      _.`case`.richCaseWithoutPerms.domainMap(c => Json.obj("case" -> c.toJson))
     )
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableTypeCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableTypeCtrl.scala
index 15bd0a9709..6e634fb989 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableTypeCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableTypeCtrl.scala
@@ -4,12 +4,12 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputObservableType
 import org.thp.thehive.models.{ObservableType, Permissions}
-import org.thp.thehive.services.{ObservableTypeSrv, ObservableTypeSteps}
+import org.thp.thehive.services.ObservableTypeSrv
 import play.api.mvc.{Action, AnyContent, Results}
 
 @Singleton
@@ -22,14 +22,16 @@ class ObservableTypeCtrl @Inject() (
 
   override val entityName: String                           = "ObjservableType"
   override val publicProperties: List[PublicProperty[_, _]] = properties.observableType
-  override val initialQuery: Query                          = Query.init[ObservableTypeSteps]("listObservableType", (graph, _) => observableTypeSrv.initSteps(graph))
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, ObservableTypeSteps, PagedResult[ObservableType with Entity]](
-    "page",
-    FieldsParser[OutputParam],
-    (range, observableTypeSteps, _) => observableTypeSteps.page(range.from, range.to, withTotal = true)
-  )
+  override val initialQuery: Query =
+    Query.init[Traversal.V[ObservableType]]("listObservableType", (graph, _) => observableTypeSrv.startTraversal(graph))
+  override val pageQuery: ParamQuery[OutputParam] =
+    Query.withParam[OutputParam, Traversal.V[ObservableType], IteratorOutput](
+      "page",
+      FieldsParser[OutputParam],
+      (range, observableTypeSteps, _) => observableTypeSteps.richPage(range.from, range.to, withTotal = true)(identity)
+    )
   override val outputQuery: Query = Query.output[ObservableType with Entity]
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, ObservableTypeSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[ObservableType]](
     "getObservableType",
     FieldsParser[IdOrName],
     (param, graph, _) => observableTypeSrv.get(param.idOrName)(graph)
diff --git a/thehive/app/org/thp/thehive/controllers/v0/OrganisationCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/OrganisationCtrl.scala
index 3445df760d..1a9d97c5e6 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/OrganisationCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/OrganisationCtrl.scala
@@ -5,11 +5,13 @@ import org.thp.scalligraph.NotFoundError
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputOrganisation
-import org.thp.thehive.models.{Organisation, Permissions}
+import org.thp.thehive.models.{CaseTemplate, Organisation, Permissions, User}
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.mvc.{Action, AnyContent, Results}
 
@@ -18,31 +20,31 @@ import scala.util.{Failure, Success}
 @Singleton
 class OrganisationCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     organisationSrv: OrganisationSrv,
-    userSrv: UserSrv
+    userSrv: UserSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
 
   override val entityName: String                           = "organisation"
   override val publicProperties: List[PublicProperty[_, _]] = properties.organisation
   override val initialQuery: Query =
-    Query.init[OrganisationSteps]("listOrganisation", (graph, authContext) => organisationSrv.initSteps(graph).visible(authContext))
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, OrganisationSteps, PagedResult[Organisation with Entity]](
+    Query.init[Traversal.V[Organisation]]("listOrganisation", (graph, authContext) => organisationSrv.startTraversal(graph).visible(authContext))
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Organisation], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, organisationSteps, _) => organisationSteps.page(range.from, range.to, withTotal = true)
   )
   override val outputQuery: Query = Query.output[Organisation with Entity]
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, OrganisationSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Organisation]](
     "getOrganisation",
     FieldsParser[IdOrName],
     (param, graph, authContext) => organisationSrv.get(param.idOrName)(graph).visible(authContext)
   )
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[OrganisationSteps, OrganisationSteps]("visible", (organisationSteps, _) => organisationSteps.visibleOrganisationsFrom),
-    Query[OrganisationSteps, UserSteps]("users", (organisationSteps, _) => organisationSteps.users),
-    Query[OrganisationSteps, CaseTemplateSteps]("caseTemplates", (organisationSteps, _) => organisationSteps.caseTemplates)
+    Query[Traversal.V[Organisation], Traversal.V[Organisation]]("visible", (organisationSteps, _) => organisationSteps.visibleOrganisationsFrom),
+    Query[Traversal.V[Organisation], Traversal.V[User]]("users", (organisationSteps, _) => organisationSteps.users),
+    Query[Traversal.V[Organisation], Traversal.V[CaseTemplate]]("caseTemplates", (organisationSteps, _) => organisationSteps.caseTemplates)
   )
 
   def create: Action[AnyContent] =
@@ -51,7 +53,7 @@ class OrganisationCtrl @Inject() (
       .authTransaction(db) { implicit request => implicit graph =>
         val inputOrganisation: InputOrganisation = request.body("organisation")
         for {
-          _   <- userSrv.current.organisations(Permissions.manageOrganisation).get(Organisation.administration.name).existsOrFail()
+          _   <- userSrv.current.organisations(Permissions.manageOrganisation).get(Organisation.administration.name).existsOrFail
           org <- organisationSrv.create(inputOrganisation.toOrganisation)
 
         } yield Results.Created(org.toJson)
@@ -72,10 +74,10 @@ class OrganisationCtrl @Inject() (
     entrypoint("list organisation")
       .authRoTransaction(db) { implicit request => implicit graph =>
         val organisations = organisationSrv
-          .initSteps
+          .startTraversal
           .visible
           .richOrganisation
-          .toList
+          .toSeq
 
         Success(Results.Ok(organisations.toJson))
       }
@@ -128,7 +130,7 @@ class OrganisationCtrl @Inject() (
   def listLinks(organisationId: String): Action[AnyContent] =
     entrypoint("list organisation links")
       .authRoTransaction(db) { implicit request => implicit graph =>
-        val isInDefaultOrganisation = userSrv.current.organisations.get(Organisation.administration.name).exists()
+        val isInDefaultOrganisation = userSrv.current.organisations.get(Organisation.administration.name).exists
         val organisation =
           if (isInDefaultOrganisation)
             organisationSrv.get(organisationId)
@@ -137,7 +139,7 @@ class OrganisationCtrl @Inject() (
               .current
               .organisations
               .get(organisationId)
-        val organisations = organisation.links.toList
+        val organisations = organisation.links.toSeq
 
         Success(Results.Ok(organisations.toJson))
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/PageCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/PageCtrl.scala
index 39bd932da4..3b793214dd 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/PageCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/PageCtrl.scala
@@ -4,12 +4,14 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputPage
 import org.thp.thehive.models.{Page, Permissions}
-import org.thp.thehive.services.{OrganisationSrv, PageSrv, PageSteps}
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.PageOps._
+import org.thp.thehive.services.{OrganisationSrv, PageSrv}
 import play.api.mvc._
 
 @Singleton
@@ -22,15 +24,15 @@ class PageCtrl @Inject() (
 ) extends QueryableCtrl {
 
   override val entityName: String                           = "page"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.page ::: metaProperties[PageSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.page
   override val initialQuery: Query =
-    Query.init[PageSteps]("listPage", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).pages)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, PageSteps](
+    Query.init[Traversal.V[Page]]("listPage", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).pages)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Page]](
     "getPage",
     FieldsParser[IdOrName],
     (param, graph, authContext) => pageSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, PageSteps, PagedResult[Page with Entity]](
+  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Page], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, pageSteps, _) => pageSteps.page(range.from, range.to, withTotal = true)
@@ -43,7 +45,7 @@ class PageCtrl @Inject() (
         pageSrv
           .get(idOrTitle)
           .visible
-          .getOrFail()
+          .getOrFail("Page")
           .map(p => Results.Ok(p.toJson))
       }
 
@@ -65,7 +67,7 @@ class PageCtrl @Inject() (
         val propertyUpdaters: Seq[PropertyUpdater] = request.body("page")
 
         for {
-          page    <- pageSrv.get(idOrTitle).visible.getOrFail()
+          page    <- pageSrv.get(idOrTitle).visible.getOrFail("Page")
           updated <- pageSrv.update(page, propertyUpdaters)
         } yield Results.Ok(updated.toJson)
       }
@@ -74,7 +76,7 @@ class PageCtrl @Inject() (
     entrypoint("delete a page")
       .authPermittedTransaction(db, Permissions.managePage) { implicit request => implicit graph =>
         for {
-          page <- pageSrv.get(idOrTitle).visible.getOrFail()
+          page <- pageSrv.get(idOrTitle).visible.getOrFail("Page")
           _    <- pageSrv.delete(page)
         } yield Results.NoContent
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/PermissionCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/PermissionCtrl.scala
index 132bc25e72..bb9f9a675f 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/PermissionCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/PermissionCtrl.scala
@@ -2,7 +2,6 @@ package org.thp.thehive.controllers.v0
 
 import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.Entrypoint
-import org.thp.scalligraph.controllers.Renderer.setRenderer
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.models.Permissions
 import play.api.mvc.{Action, AnyContent, Results}
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ProfileCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ProfileCtrl.scala
index 82f509a32a..fb61f38e0e 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ProfileCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ProfileCtrl.scala
@@ -5,32 +5,37 @@ import org.thp.scalligraph.AuthorizationError
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputProfile
 import org.thp.thehive.models.{Permissions, Profile}
-import org.thp.thehive.services.{ProfileSrv, ProfileSteps}
+import org.thp.thehive.services.ProfileOps._
+import org.thp.thehive.services.ProfileSrv
 import play.api.mvc.{Action, AnyContent, Results}
 
 import scala.util.Failure
 
 @Singleton
-class ProfileCtrl @Inject() (entrypoint: Entrypoint, @Named("with-thehive-schema") db: Database, properties: Properties, profileSrv: ProfileSrv)
-    extends QueryableCtrl {
+class ProfileCtrl @Inject() (
+    entrypoint: Entrypoint,
+    properties: Properties,
+    profileSrv: ProfileSrv,
+    @Named("with-thehive-schema") implicit val db: Database
+) extends QueryableCtrl {
 
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, ProfileSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Profile]](
     "getProfile",
     FieldsParser[IdOrName],
     (param, graph, _) => profileSrv.get(param.idOrName)(graph)
   )
   val entityName: String                           = "profile"
-  val publicProperties: List[PublicProperty[_, _]] = properties.profile ::: metaProperties[ProfileSteps]
+  val publicProperties: List[PublicProperty[_, _]] = properties.profile
 
   val initialQuery: Query =
-    Query.init[ProfileSteps]("listProfile", (graph, _) => profileSrv.initSteps(graph))
+    Query.init[Traversal.V[Profile]]("listProfile", (graph, _) => profileSrv.startTraversal(graph))
 
-  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, ProfileSteps, PagedResult[Profile with Entity]](
+  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Profile], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, profileSteps, _) => profileSteps.page(range.from, range.to, withTotal = true)
diff --git a/thehive/app/org/thp/thehive/controllers/v0/Properties.scala b/thehive/app/org/thp/thehive/controllers/v0/Properties.scala
index a4a8a7b17d..d04c59b454 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/Properties.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/Properties.scala
@@ -1,47 +1,35 @@
 package org.thp.thehive.controllers.v0
 
+import java.lang.{Long => JLong}
 import java.util.Date
 
-import gremlin.scala.{__, By, Key, P}
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.process.traversal.P
 import org.scalactic.Accumulation._
 import org.thp.scalligraph.controllers._
-import org.thp.scalligraph.models.UniMapping
-import org.thp.scalligraph.query.{NoValue, PublicProperty, PublicPropertyListBuilder}
-import org.thp.scalligraph.steps.IdMapping
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.models.{Database, IdMapping, UMapping}
+import org.thp.scalligraph.query.{PublicProperty, PublicPropertyListBuilder}
+import org.thp.scalligraph.traversal.Converter
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AttributeCheckingError, AuthorizationError, BadRequestError, InvalidFormatAttributeError, RichSeq}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputTask
-import org.thp.thehive.models.{CaseStatus, Permissions, TaskStatus}
-import org.thp.thehive.services.{
-  AlertSrv,
-  AlertSteps,
-  AuditSteps,
-  CaseSrv,
-  CaseSteps,
-  CaseTemplateSrv,
-  CaseTemplateSteps,
-  CustomFieldSrv,
-  CustomFieldSteps,
-  DashboardSrv,
-  DashboardSteps,
-  LogSteps,
-  ObservableSrv,
-  ObservableSteps,
-  ObservableTypeSteps,
-  OrganisationSteps,
-  PageSteps,
-  ProfileSteps,
-  TagSteps,
-  TaskSrv,
-  TaskSteps,
-  UserSrv,
-  UserSteps
-}
-import play.api.libs.json.{JsNull, JsObject, JsValue, Json}
+import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.AuditOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.CustomFieldOps._
+import org.thp.thehive.services.DashboardOps._
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.TagOps._
+import org.thp.thehive.services.TaskOps._
+import org.thp.thehive.services.UserOps._
+import org.thp.thehive.services._
+import play.api.libs.json.{JsObject, JsValue, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.{Failure, Success, Try}
 
 @Singleton
@@ -53,20 +41,21 @@ class Properties @Inject() (
     observableSrv: ObservableSrv,
     caseTemplateSrv: CaseTemplateSrv,
     taskSrv: TaskSrv,
-    customFieldSrv: CustomFieldSrv
+    customFieldSrv: CustomFieldSrv,
+    db: Database
 ) {
 
   lazy val alert: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[AlertSteps]
-      .property("type", UniMapping.string)(_.field.updatable)
-      .property("source", UniMapping.string)(_.field.updatable)
-      .property("sourceRef", UniMapping.string)(_.field.updatable)
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
-      .property("severity", UniMapping.int)(_.field.updatable)
-      .property("date", UniMapping.date)(_.field.updatable)
-      .property("lastSyncDate", UniMapping.date.optional)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[Alert]
+      .property("type", UMapping.string)(_.field.updatable)
+      .property("source", UMapping.string)(_.field.updatable)
+      .property("sourceRef", UMapping.string)(_.field.updatable)
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string)(_.field.updatable)
+      .property("severity", UMapping.int)(_.field.updatable)
+      .property("date", UMapping.date)(_.field.updatable)
+      .property("lastSyncDate", UMapping.date.optional)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             alertSrv
@@ -76,17 +65,17 @@ class Properties @Inject() (
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("tlp", UniMapping.int)(_.field.updatable)
-      .property("pap", UniMapping.int)(_.field.updatable)
-      .property("read", UniMapping.boolean)(_.field.updatable)
-      .property("follow", UniMapping.boolean)(_.field.updatable)
-      .property("status", UniMapping.string)(
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("tlp", UMapping.int)(_.field.updatable)
+      .property("pap", UMapping.int)(_.field.updatable)
+      .property("read", UMapping.boolean)(_.field.updatable)
+      .property("follow", UMapping.boolean)(_.field.updatable)
+      .property("status", UMapping.string)(
         _.select(
           _.project(
-            _.by(Key[Boolean]("read"))
+            _.byValue(_.read)
               .by(_.`case`.limit(1).count)
-          ).map {
+          ).domainMap {
             case (false, caseCount) if caseCount == 0L => "New"
             case (false, _)                            => "Updated"
             case (true, caseCount) if caseCount == 0L  => "Ignored"
@@ -94,15 +83,16 @@ class Properties @Inject() (
           }
         ).readonly
       )
-      .property("summary", UniMapping.string.optional)(_.field.updatable)
-      .property("user", UniMapping.string)(_.field.updatable)
-      .property("customFields", UniMapping.identity[JsValue])(_.subSelect {
-        case (FPathElem(_, FPathElem(name, _)), alertSteps) => alertSteps.customFields(name).jsonValue
-        case (_, alertSteps)                                => alertSteps.customFields.nameJsonValue.fold.map(l => JsObject(l.asScala))
+      .property("summary", UMapping.string.optional)(_.field.updatable)
+      .property("user", UMapping.string)(_.field.updatable)
+      .property("customFields", UMapping.jsonNative)(_.subSelect {
+        case (FPathElem(_, FPathElem(name, _)), alertSteps) =>
+          alertSteps.customFields(name).jsonValue
+        case (_, alertSteps) => alertSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
       }.custom {
         case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
           for {
-            c <- alertSrv.getOrFail(vertex)(graph)
+            c <- alertSrv.getByIds(vertex.id.toString)(graph).getOrFail("Alert")
             _ <- alertSrv.setOrCreateCustomField(c, name, Some(value))(graph, authContext)
           } yield Json.obj(s"customField.$name" -> value)
         case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
@@ -113,31 +103,31 @@ class Properties @Inject() (
           } yield Json.obj("customFields" -> values)
 
         case _ => Failure(BadRequestError("Invalid custom fields format"))
-      })(NoValue(JsNull))
+      })
       .property("case", IdMapping)(_.select(_.`case`._id).readonly)
       .build
 
   lazy val audit: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[AuditSteps]
-      .property("operation", UniMapping.string)(_.rename("action").readonly)
-      .property("details", UniMapping.string)(_.field.readonly)
-      .property("objectType", UniMapping.string.optional)(_.field.readonly)
-      .property("objectId", UniMapping.string.optional)(_.field.readonly)
-      .property("base", UniMapping.boolean)(_.rename("mainAction").readonly)
-      .property("startDate", UniMapping.date)(_.rename("_createdAt").readonly)
-      .property("requestId", UniMapping.string)(_.field.readonly)
+    PublicPropertyListBuilder[Audit]
+      .property("operation", UMapping.string)(_.rename("action").readonly)
+      .property("details", UMapping.string)(_.field.readonly)
+      .property("objectType", UMapping.string.optional)(_.field.readonly)
+      .property("objectId", UMapping.string.optional)(_.field.readonly)
+      .property("base", UMapping.boolean)(_.rename("mainAction").readonly)
+      .property("startDate", UMapping.date)(_.rename("_createdAt").readonly)
+      .property("requestId", UMapping.string)(_.field.readonly)
       .property("rootId", IdMapping)(_.select(_.context._id).readonly)
       .build
 
   lazy val `case`: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[CaseSteps]
-      .property("caseId", UniMapping.int)(_.rename("number").readonly)
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
-      .property("severity", UniMapping.int)(_.field.updatable)
-      .property("startDate", UniMapping.date)(_.field.updatable)
-      .property("endDate", UniMapping.date.optional)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[Case]
+      .property("caseId", UMapping.int)(_.rename("number").readonly)
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string)(_.field.updatable)
+      .property("severity", UMapping.int)(_.field.updatable)
+      .property("startDate", UMapping.date)(_.field.updatable)
+      .property("endDate", UMapping.date.optional)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             caseSrv
@@ -147,12 +137,12 @@ class Properties @Inject() (
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("tlp", UniMapping.int)(_.field.updatable)
-      .property("pap", UniMapping.int)(_.field.updatable)
-      .property("status", UniMapping.enum(CaseStatus))(_.field.updatable)
-      .property("summary", UniMapping.string.optional)(_.field.updatable)
-      .property("owner", UniMapping.string.optional)(_.select(_.user.login).custom { (_, login, vertex, _, graph, authContext) =>
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("tlp", UMapping.int)(_.field.updatable)
+      .property("pap", UMapping.int)(_.field.updatable)
+      .property("status", UMapping.enum[CaseStatus.type])(_.field.updatable)
+      .property("summary", UMapping.string.optional)(_.field.updatable)
+      .property("owner", UMapping.string.optional)(_.select(_.user.value(_.login)).custom { (_, login, vertex, _, graph, authContext) =>
         for {
           c    <- caseSrv.get(vertex)(graph).getOrFail("Case")
           user <- login.map(userSrv.get(_)(graph).getOrFail("User")).flip
@@ -162,7 +152,7 @@ class Properties @Inject() (
           }
         } yield Json.obj("owner" -> user.map(_.login))
       })
-      .property("resolutionStatus", UniMapping.string.optional)(_.select(_.resolutionStatus.value).custom {
+      .property("resolutionStatus", UMapping.string.optional)(_.select(_.resolutionStatus.value(_.value)).custom {
         (_, resolutionStatus, vertex, _, graph, authContext) =>
           for {
             c <- caseSrv.get(vertex)(graph).getOrFail("Case")
@@ -172,48 +162,78 @@ class Properties @Inject() (
             }
           } yield Json.obj("resolutionStatus" -> resolutionStatus)
       })
-      .property("impactStatus", UniMapping.string.optional)(_.select(_.impactStatus.value).custom {
+      .property("impactStatus", UMapping.string.optional)(_.select(_.impactStatus.value(_.value)).custom {
         (_, impactStatus, vertex, _, graph, authContext) =>
           for {
-            c <- caseSrv.getOrFail(vertex)(graph)
+            c <- caseSrv.getByIds(vertex.id.toString)(graph).getOrFail("Case")
             _ <- impactStatus match {
               case Some(s) => caseSrv.setImpactStatus(c, s)(graph, authContext)
               case None    => caseSrv.unsetImpactStatus(c)(graph, authContext)
             }
           } yield Json.obj("impactStatus" -> impactStatus)
       })
-      .property("customFields", UniMapping.jsonNative)(_.subSelect {
+      .property("customFields", UMapping.jsonNative)(_.subSelect {
         case (FPathElem(_, FPathElem(name, _)), caseSteps) =>
           caseSteps
             .customFields(name)
-            .value
-            .cast(UniMapping.jsonNative)
-            .get // can't fail
-
-        case (_, caseSteps) => caseSteps.customFields.nameJsonValue.fold.map(l => JsObject(l.asScala)).cast(UniMapping.jsonNative).get
-      }.custom {
-        case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
-          for {
-//            v <- UniMapping.jsonNative.toGraphOpt(value).fold[Try[Any]](???)(Success.apply)
-            c <- caseSrv.getOrFail(vertex)(graph)
-            _ <- caseSrv.setOrCreateCustomField(c, name, Some(value), None)(graph, authContext)
-          } yield Json.obj(s"customField.$name" -> value)
-        case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
-          for {
-            c   <- caseSrv.get(vertex)(graph).getOrFail("Case")
-            cfv <- values.fields.toTry { case (n, v) => customFieldSrv.getOrFail(n)(graph).map(cf => (cf, v, None)) }
-            _   <- caseSrv.updateCustomField(c, cfv)(graph, authContext)
-          } yield Json.obj("customFields" -> values)
-        case _ => Failure(BadRequestError("Invalid custom fields format"))
-      })(NoValue(JsNull))
-      .property("computed.handlingDurationInHours", UniMapping.long)(
+            .jsonValue
+        case (_, caseSteps) => caseSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
+      }
+        .filter {
+          case (FPathElem(_, FPathElem(name, _)), caseTraversal) =>
+            db
+              .roTransaction(implicit graph => customFieldSrv.get(name).value(_.`type`).getOrFail("CustomField"))
+              .map {
+                case CustomFieldType.boolean => caseTraversal.customFields(name).value(_.booleanValue)
+                case CustomFieldType.date    => caseTraversal.customFields(name).value(_.dateValue)
+                case CustomFieldType.float   => caseTraversal.customFields(name).value(_.floatValue)
+                case CustomFieldType.integer => caseTraversal.customFields(name).value(_.integerValue)
+                case CustomFieldType.string  => caseTraversal.customFields(name).value(_.stringValue)
+              }
+              .getOrElse(caseTraversal.constant2(null))
+          case (_, caseTraversal) => caseTraversal.constant2(null)
+        }
+        .converter {
+          case FPathElem(_, FPathElem(name, _)) =>
+            db
+              .roTransaction { implicit graph =>
+                customFieldSrv.get(name).value(_.`type`).getOrFail("CustomField")
+              }
+              .map {
+                case CustomFieldType.boolean => new Converter[Any, JsValue] { def apply(x: JsValue): Any = x.as[Boolean] }
+                case CustomFieldType.date    => new Converter[Any, JsValue] { def apply(x: JsValue): Any = x.as[Date] }
+                case CustomFieldType.float   => new Converter[Any, JsValue] { def apply(x: JsValue): Any = x.as[Double] }
+                case CustomFieldType.integer => new Converter[Any, JsValue] { def apply(x: JsValue): Any = x.as[Long] }
+                case CustomFieldType.string  => new Converter[Any, JsValue] { def apply(x: JsValue): Any = x.as[String] }
+              }
+              .getOrElse(new Converter[Any, JsValue] { def apply(x: JsValue): Any = x })
+          case _ => (x: JsValue) => x
+        }
+        .custom {
+          case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
+            for {
+              c <- caseSrv.getByIds(vertex.id.toString)(graph).getOrFail("Case")
+              _ <- caseSrv.setOrCreateCustomField(c, name, Some(value), None)(graph, authContext)
+            } yield Json.obj(s"customField.$name" -> value)
+          case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
+            for {
+              c   <- caseSrv.get(vertex)(graph).getOrFail("Case")
+              cfv <- values.fields.toTry { case (n, v) => customFieldSrv.getOrFail(n)(graph).map(cf => (cf, v, None)) }
+              _   <- caseSrv.updateCustomField(c, cfv)(graph, authContext)
+            } yield Json.obj("customFields" -> values)
+          case _ => Failure(BadRequestError("Invalid custom fields format"))
+        })
+      .property("computed.handlingDurationInHours", UMapping.long)(
         _.select(
           _.coalesce(
             _.has("endDate")
-              .sack((_: Long, endDate: Long) => endDate, By(__.value(Key[Date]("endDate")).map(_.getTime)))
-              .sack((_: Long) - (_: Long), By(__.value(Key[Date]("startDate")).map(_.getTime)))
-              .sack((_: Long) / (_: Long), By(__.constant(3600000L)))
-              .sack[Long](),
+              .sack(
+                (_: JLong, endDate: JLong) => endDate,
+                _.by(_.value(_.endDate).graphMap[Long, JLong, Converter[Long, JLong]](_.getTime, Converter.long))
+              )
+              .sack((_: Long) - (_: JLong), _.by(_.value(_.startDate).graphMap[Long, JLong, Converter[Long, JLong]](_.getTime, Converter.long)))
+              .sack((_: Long) / (_: Long), _.by(_.constant(3600000L)))
+              .sack[Long],
             _.constant(0L)
           )
         ).readonly
@@ -221,13 +241,13 @@ class Properties @Inject() (
       .build
 
   lazy val caseTemplate: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[CaseTemplateSteps]
-      .property("name", UniMapping.string)(_.field.updatable)
-      .property("displayName", UniMapping.string)(_.field.updatable)
-      .property("titlePrefix", UniMapping.string.optional)(_.field.updatable)
-      .property("description", UniMapping.string.optional)(_.field.updatable)
-      .property("severity", UniMapping.int.optional)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[CaseTemplate]
+      .property("name", UMapping.string)(_.field.updatable)
+      .property("displayName", UMapping.string)(_.field.updatable)
+      .property("titlePrefix", UMapping.string.optional)(_.field.updatable)
+      .property("description", UMapping.string.optional)(_.field.updatable)
+      .property("severity", UMapping.int.optional)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             caseTemplateSrv
@@ -237,18 +257,18 @@ class Properties @Inject() (
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("tlp", UniMapping.int.optional)(_.field.updatable)
-      .property("pap", UniMapping.int.optional)(_.field.updatable)
-      .property("summary", UniMapping.string.optional)(_.field.updatable)
-      .property("user", UniMapping.string)(_.field.updatable)
-      .property("customFields", UniMapping.identity[JsValue])(_.subSelect {
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("tlp", UMapping.int.optional)(_.field.updatable)
+      .property("pap", UMapping.int.optional)(_.field.updatable)
+      .property("summary", UMapping.string.optional)(_.field.updatable)
+      .property("user", UMapping.string)(_.field.updatable)
+      .property("customFields", UMapping.jsonNative)(_.subSelect {
         case (FPathElem(_, FPathElem(name, _)), caseTemplateSteps) => caseTemplateSteps.customFields(name).jsonValue
-        case (_, caseTemplateSteps)                                => caseTemplateSteps.customFields.nameJsonValue.fold.map(l => JsObject(l.asScala))
+        case (_, caseTemplateSteps)                                => caseTemplateSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
       }.custom {
         case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
           for {
-            c <- caseTemplateSrv.getOrFail(vertex)(graph)
+            c <- caseTemplateSrv.getByIds(vertex.id.toString)(graph).getOrFail("CaseTemplate")
             _ <- caseTemplateSrv.setOrCreateCustomField(c, name, Some(value), None)(graph, authContext)
           } yield Json.obj(s"customFields.$name" -> value)
         case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
@@ -258,39 +278,40 @@ class Properties @Inject() (
             _   <- caseTemplateSrv.updateCustomField(c, cfv)(graph, authContext)
           } yield Json.obj("customFields" -> values)
         case _ => Failure(BadRequestError("Invalid custom fields format"))
-      })(NoValue(JsNull))
-      .property("tasks", UniMapping.identity[JsValue].sequence)(_.select(_.tasks.richTask.map(_.toJson)).custom {
+      })
+      .property("tasks", UMapping.jsonNative.sequence)(_.select(_.tasks.richTask.domainMap(_.toJson)).custom { //  FIXME select the correct mapping
         (_, value, vertex, _, graph, authContext) =>
           val fp = FieldsParser[InputTask]
 
           caseTemplateSrv.get(vertex)(graph).tasks.remove()
           for {
-            caseTemplate <- caseTemplateSrv.getOrFail(vertex)(graph)
+            caseTemplate <- caseTemplateSrv.getByIds(vertex.id.toString)(graph).getOrFail("CaseTemplate")
             tasks        <- value.validatedBy(t => fp(Field(t))).badMap(AttributeCheckingError(_)).toTry
-            createdTasks <- tasks
-              .toTry(t => t.owner.map(userSrv.getOrFail(_)(graph)).flip.flatMap(owner => taskSrv.create(t.toTask, owner)(graph, authContext)))
+            createdTasks <-
+              tasks
+                .toTry(t => t.owner.map(userSrv.getOrFail(_)(graph)).flip.flatMap(owner => taskSrv.create(t.toTask, owner)(graph, authContext)))
             _ <- createdTasks.toTry(t => caseTemplateSrv.addTask(caseTemplate, t.task)(graph, authContext))
           } yield Json.obj("tasks" -> createdTasks.map(_.toJson))
-      })(NoValue(JsNull))
+      })
       .build
 
   lazy val customField: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[CustomFieldSteps]
-      .property("name", UniMapping.string)(_.rename("displayName").updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
-      .property("reference", UniMapping.string)(_.rename("name").readonly)
-      .property("mandatory", UniMapping.boolean)(_.field.updatable)
-      .property("type", UniMapping.string)(_.field.readonly)
-      .property("options", UniMapping.json.sequence)(_.field.updatable)
+    PublicPropertyListBuilder[CustomField]
+      .property("name", UMapping.string)(_.rename("displayName").updatable)
+      .property("description", UMapping.string)(_.field.updatable)
+      .property("reference", UMapping.string)(_.rename("name").readonly)
+      .property("mandatory", UMapping.boolean)(_.field.updatable)
+      .property("type", UMapping.string)(_.field.readonly)
+      .property("options", UMapping.json.sequence)(_.field.updatable)
       .build
 
   lazy val dashboard: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[DashboardSteps]
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
-      .property("definition", UniMapping.string)(_.field.updatable)
-      .property("status", UniMapping.string)(
-        _.select(_.organisation.fold.map(d => if (d.isEmpty) "Private" else "Shared")).custom { // TODO replace by choose step
+    PublicPropertyListBuilder[Dashboard]
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string)(_.field.updatable)
+      .property("definition", UMapping.string)(_.field.updatable)
+      .property("status", UMapping.string)(
+        _.select(_.organisation.fold.domainMap(d => if (d.isEmpty) "Private" else "Shared")).custom { // TODO replace by choose step
           case (_, "Shared", vertex, _, graph, authContext) =>
             for {
               dashboard <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
@@ -316,86 +337,88 @@ class Properties @Inject() (
       .build
 
   lazy val log: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[LogSteps]
-      .property("message", UniMapping.string)(_.field.updatable)
-      .property("deleted", UniMapping.boolean)(_.field.updatable)
-      .property("startDate", UniMapping.date)(_.rename("date").readonly)
-      .property("status", UniMapping.string)(_.select(_.constant("Ok")).readonly)
+    PublicPropertyListBuilder[Log]
+      .property("message", UMapping.string)(_.field.updatable)
+      .property("deleted", UMapping.boolean)(_.field.updatable)
+      .property("startDate", UMapping.date)(_.rename("date").readonly)
+      .property("status", UMapping.string)(_.select(_.constant("Ok")).readonly)
       .property("attachment", IdMapping)(_.select(_.attachments._id).readonly)
       .build
 
   lazy val observable: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[ObservableSteps]
-      .property("status", UniMapping.string)(_.select(_.constant("Ok")).readonly)
-      .property("startDate", UniMapping.date)(_.select(_._createdAt).readonly)
-      .property("ioc", UniMapping.boolean)(_.field.updatable)
-      .property("sighted", UniMapping.boolean)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[Observable]
+      .property("status", UMapping.string)(_.select(_.constant("Ok")).readonly)
+      .property("startDate", UMapping.date)(_.select(_._createdAt).readonly)
+      .property("ioc", UMapping.boolean)(_.field.updatable)
+      .property("sighted", UMapping.boolean)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             observableSrv
-              .getOrFail(vertex)(graph)
+              .getByIds(vertex.id.toString)(graph)
+              .getOrFail("Observable")
               .flatMap(observable => observableSrv.updateTagNames(observable, value)(graph, authContext))
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("message", UniMapping.string)(_.field.updatable)
-      .property("tlp", UniMapping.int)(_.field.updatable)
-      .property("dataType", UniMapping.string)(_.select(_.observableType.name).readonly)
-      .property("data", UniMapping.string.optional)(_.select(_.data.data).readonly)
-      .property("attachment.name", UniMapping.string.optional)(_.select(_.attachments.name).readonly)
-      .property("attachment.size", UniMapping.long.optional)(_.select(_.attachments.size).readonly)
-      .property("attachment.contentType", UniMapping.string.optional)(_.select(_.attachments.contentType).readonly)
-      .property("attachment.hashes", UniMapping.string)(_.select(_.attachments.hashes.map(_.toString)).readonly)
+      .property("message", UMapping.string)(_.field.updatable)
+      .property("tlp", UMapping.int)(_.field.updatable)
+      .property("dataType", UMapping.string)(_.select(_.observableType.value(_.name)).readonly)
+      .property("data", UMapping.string.optional)(_.select(_.data.value(_.data)).readonly)
+      .property("attachment.name", UMapping.string.optional)(_.select(_.attachments.value(_.name)).readonly)
+      .property("attachment.size", UMapping.long.optional)(_.select(_.attachments.value(_.size)).readonly)
+      .property("attachment.contentType", UMapping.string.optional)(_.select(_.attachments.value(_.contentType)).readonly)
+      .property("attachment.hashes", UMapping.hash)(_.select(_.attachments.value(_.hashes)).readonly)
       .build
 
   lazy val organisation: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[OrganisationSteps]
-      .property("name", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
+    PublicPropertyListBuilder[Organisation]
+      .property("name", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string)(_.field.updatable)
       .build
 
   lazy val page: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[PageSteps]
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("content", UniMapping.string.set)(_.field.updatable)
+    PublicPropertyListBuilder[Page]
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("content", UMapping.string.set)(_.field.updatable)
       .build
 
   lazy val profile: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[ProfileSteps]
-      .property("name", UniMapping.string)(_.field.updatable)
-      .property("permissions", UniMapping.string.set)(_.field.updatable)
+    PublicPropertyListBuilder[Profile]
+      .property("name", UMapping.string)(_.field.updatable)
+      .property("permissions", UMapping.string.set)(_.field.updatable)
       .build
 
-  lazy val tag: List[PublicProperty[_, _]] = PublicPropertyListBuilder[TagSteps]
-    .property("namespace", UniMapping.string)(_.field.readonly)
-    .property("predicate", UniMapping.string)(_.field.readonly)
-    .property("value", UniMapping.string.optional)(_.field.readonly)
-    .property("description", UniMapping.string.optional)(_.field.readonly)
-    .property("text", UniMapping.string)(_.select(_.displayName).readonly)
+  lazy val tag: List[PublicProperty[_, _]] = PublicPropertyListBuilder[Tag]
+    .property("namespace", UMapping.string)(_.field.readonly)
+    .property("predicate", UMapping.string)(_.field.readonly)
+    .property("value", UMapping.string.optional)(_.field.readonly)
+    .property("description", UMapping.string.optional)(_.field.readonly)
+    .property("text", UMapping.string)(_.select(_.displayName).readonly)
     .build
 
   lazy val task: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[TaskSteps]
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string.optional)(_.field.updatable)
-      .property("status", UniMapping.enum(TaskStatus))(_.field.custom { (_, value, vertex, _, graph, authContext) =>
+    PublicPropertyListBuilder[Task]
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string.optional)(_.field.updatable)
+      .property("status", UMapping.enum[TaskStatus.type])(_.field.custom { (_, value, vertex, _, graph, authContext) =>
         for {
           task <- taskSrv.get(vertex)(graph).getOrFail("Task")
-          user <- userSrv
-            .current(graph, authContext)
-            .getOrFail("User")
+          user <-
+            userSrv
+              .current(graph, authContext)
+              .getOrFail("User")
           _ <- taskSrv.updateStatus(task, user, value)(graph, authContext)
         } yield Json.obj("status" -> value)
       })
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("startDate", UniMapping.date.optional)(_.field.updatable)
-      .property("endDate", UniMapping.date.optional)(_.field.updatable)
-      .property("order", UniMapping.int)(_.field.updatable)
-      .property("dueDate", UniMapping.date.optional)(_.field.updatable)
-      .property("group", UniMapping.string)(_.field.updatable)
-      .property("owner", UniMapping.string.optional)(
-        _.select(_.assignee.login)
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("startDate", UMapping.date.optional)(_.field.updatable)
+      .property("endDate", UMapping.date.optional)(_.field.updatable)
+      .property("order", UMapping.int)(_.field.updatable)
+      .property("dueDate", UMapping.date.optional)(_.field.updatable)
+      .property("group", UMapping.string)(_.field.updatable)
+      .property("owner", UMapping.string.optional)(
+        _.select(_.assignee.value(_.login))
           .custom { (_, login: Option[String], vertex, _, graph, authContext) =>
             for {
               task <- taskSrv.get(vertex)(graph).getOrFail("Task")
@@ -410,38 +433,38 @@ class Properties @Inject() (
       .build
 
   lazy val user: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[UserSteps]
-      .property("login", UniMapping.string)(_.field.readonly)
-      .property("name", UniMapping.string)(_.field.custom { (_, value, vertex, db, graph, authContext) =>
+    PublicPropertyListBuilder[User]
+      .property("login", UMapping.string)(_.field.readonly)
+      .property("name", UMapping.string)(_.field.custom { (_, value, vertex, db, graph, authContext) =>
         def isCurrentUser: Try[Unit] =
           userSrv
             .current(graph, authContext)
-            .get(vertex)
-            .existsOrFail()
+            .getByIds(vertex.id.toString)
+            .existsOrFail
 
         def isUserAdmin: Try[Unit] =
           userSrv
             .current(graph, authContext)
-            .organisations(Permissions.manageUser)
+            .organisations(Permissions.manageUser)(db)
             .users
-            .get(vertex)
-            .existsOrFail()
+            .getByIds(vertex.id.toString)
+            .existsOrFail
 
         isCurrentUser
           .orElse(isUserAdmin)
           .map { _ =>
-            db.setProperty(vertex, "name", value, UniMapping.string)
+            UMapping.string.setProperty(vertex, "name", value)
             Json.obj("name" -> value)
           }
       })
-      .property("status", UniMapping.string)(
-        _.select(_.choose(predicate = _.locked.is(P.eq(true)), onTrue = _.constant("Locked"), onFalse = _.constant("Ok")))
+      .property("status", UMapping.string)(
+        _.select(_.choose(predicate = _.value(_.locked).is(P.eq(true)), onTrue = _.constant("Locked"), onFalse = _.constant("Ok")))
           .custom { (_, value, vertex, _, graph, authContext) =>
             userSrv
               .current(graph, authContext)
-              .organisations(Permissions.manageUser)
+              .organisations(Permissions.manageUser)(db)
               .users
-              .get(vertex)
+              .getByIds(vertex.id.toString)
               .orFail(AuthorizationError("Operation not permitted"))
               .flatMap {
                 case user if value == "Ok" =>
@@ -456,8 +479,8 @@ class Properties @Inject() (
       )
       .build
 
-  lazy val observableType: List[PublicProperty[_, _]] = PublicPropertyListBuilder[ObservableTypeSteps]
-    .property("name", UniMapping.string)(_.field.readonly)
-    .property("isAttachment", UniMapping.boolean)(_.field.readonly)
+  lazy val observableType: List[PublicProperty[_, _]] = PublicPropertyListBuilder[ObservableType]
+    .property("name", UMapping.string)(_.field.readonly)
+    .property("isAttachment", UMapping.boolean)(_.field.readonly)
     .build
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala
index 76883d0a71..34ffc9e253 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala
@@ -1,14 +1,15 @@
 package org.thp.thehive.controllers.v0
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Named, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.Order
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.scalactic.Accumulation._
 import org.scalactic.Good
 import org.thp.scalligraph.controllers._
-import org.thp.scalligraph.models.{Database, UniMapping}
+import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query._
-import org.thp.scalligraph.steps.BaseVertexSteps
+import org.thp.scalligraph.traversal.Traversal.Unk
+import org.thp.thehive.services.th3.TH3Aggregation
 import play.api.Logger
 import play.api.libs.json.JsObject
 import play.api.mvc.{Action, AnyContent, Results}
@@ -26,14 +27,6 @@ trait QueryableCtrl {
   val outputQuery: Query
   val getQuery: ParamQuery[IdOrName]
   val extraQueries: Seq[ParamQuery[_]] = Nil
-
-  def metaProperties[S <: BaseVertexSteps: ru.TypeTag]: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[S]
-      .property("createdBy", UniMapping.string)(_.rename("_createdBy").readonly)
-      .property("createdAt", UniMapping.date)(_.rename("_createdAt").readonly)
-      .property("updatedBy", UniMapping.string.optional)(_.rename("_updatedBy").readonly)
-      .property("updatedAt", UniMapping.date.optional)(_.rename("_updatedAt").readonly)
-      .build
 }
 
 class QueryCtrl(entrypoint: Entrypoint, @Named("with-thehive-schema") db: Database, ctrl: QueryableCtrl, queryExecutor: QueryExecutor) {
@@ -43,13 +36,12 @@ class QueryCtrl(entrypoint: Entrypoint, @Named("with-thehive-schema") db: Databa
   val filterQuery: FilterQuery                     = queryExecutor.filterQuery
   val queryType: ru.Type                           = ctrl.initialQuery.toType(ru.typeOf[Graph])
 
-  val inputFilterParser: FieldsParser[InputFilter] = queryExecutor
+  val inputFilterParser: FieldsParser[InputQuery[Unk, Unk]] = queryExecutor
     .filterQuery
     .paramParser(queryType)
 
-  val aggregationParser: FieldsParser[GroupAggregation[_, _, _]] = queryExecutor
-    .aggregationQuery
-    .paramParser(queryType)
+  val aggregationParser: FieldsParser[Aggregation] =
+    TH3Aggregation.fieldsParser
 
   val sortParser: FieldsParser[InputSort] = FieldsParser("sort") {
     case (_, FAny(s))    => Good(s)
@@ -67,21 +59,22 @@ class QueryCtrl(entrypoint: Entrypoint, @Named("with-thehive-schema") db: Databa
   val outputParamParser: FieldsParser[OutputParam] = FieldsParser[OutputParam]("OutputParam") {
     case (_, o: FObject) =>
       for {
-        fromTo <- FieldsParser
-          .string
-          .optional
-          .on("range")
-          .apply(o)
-          .map {
-            case Some("all") => (0L, Long.MaxValue)
-            case Some(r) =>
-              val Array(offsetStr, endStr, _*) = (r + "-0").split("-", 3)
-              val offset: Long                 = Try(Math.max(0, offsetStr.toLong)).getOrElse(0)
-              val end: Long                    = Try(endStr.toLong).getOrElse(offset + 10L)
-              if (end <= offset) (offset, offset + 10)
-              else (offset, end)
-            case None => (0L, 10L)
-          }
+        fromTo <-
+          FieldsParser
+            .string
+            .optional
+            .on("range")
+            .apply(o)
+            .map {
+              case Some("all") => (0L, Long.MaxValue)
+              case Some(r) =>
+                val Array(offsetStr, endStr, _*) = (r + "-0").split("-", 3)
+                val offset: Long                 = Try(Math.max(0, offsetStr.toLong)).getOrElse(0)
+                val end: Long                    = Try(endStr.toLong).getOrElse(offset + 10L)
+                if (end <= offset) (offset, offset + 10)
+                else (offset, end)
+              case None => (0L, 10L)
+            }
         withStats   <- FieldsParser.boolean.optional.on("nstats")(o)
         withParents <- FieldsParser.int.optional.on("nparent")(o)
       } yield OutputParam(fromTo._1, fromTo._2, withStats.getOrElse(false), withParents.getOrElse(0))
@@ -91,20 +84,22 @@ class QueryCtrl(entrypoint: Entrypoint, @Named("with-thehive-schema") db: Databa
     case (_, field) =>
       for {
         maybeInputFilter <- inputFilterParser.optional(field.get("query"))
-        filteredQuery = maybeInputFilter
-          .map(inputFilter => filterQuery.toQuery(inputFilter))
-          .fold(ctrl.initialQuery)(ctrl.initialQuery.andThen)
-        groupAggs <- aggregationParser.sequence(field.get("stats"))
-      } yield groupAggs.map(a => filteredQuery andThen new AggregationQuery(db, publicProperties, queryExecutor.filterQuery).toQuery(a))
+        filteredQuery =
+          maybeInputFilter
+            .map(inputFilter => filterQuery.toQuery(inputFilter))
+            .fold(ctrl.initialQuery)(ctrl.initialQuery.andThen)
+        aggs <- aggregationParser.sequence(field.get("stats"))
+      } yield aggs.map(a => filteredQuery andThen new AggregationQuery(db, publicProperties, queryExecutor.filterQuery).toQuery(a))
   }
 
   val searchParser: FieldsParser[Query] = FieldsParser[Query]("search") {
     case (_, field) =>
       for {
         maybeInputFilter <- inputFilterParser.optional(field.get("query"))
-        filteredQuery = maybeInputFilter
-          .map(inputFilter => filterQuery.toQuery(inputFilter))
-          .fold(ctrl.initialQuery)(ctrl.initialQuery.andThen)
+        filteredQuery =
+          maybeInputFilter
+            .map(inputFilter => filterQuery.toQuery(inputFilter))
+            .fold(ctrl.initialQuery)(ctrl.initialQuery.andThen)
         inputSort <- sortParser(field.get("sort"))
         sortedQuery = filteredQuery andThen new SortQuery(db, publicProperties).toQuery(inputSort)
         outputParam <- outputParamParser.optional(field).map(_.getOrElse(OutputParam(0, 10, withStats = false, withParents = 0)))
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala
index 3a49a8141e..a3d8f68c98 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala
@@ -1,15 +1,20 @@
 package org.thp.thehive.controllers.v0
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AuthorizationError, BadRequestError, RichSeq}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.{InputShare, ObservablesFilter, TasksFilter}
 import org.thp.thehive.models.Permissions
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services._
 import play.api.mvc.{Action, AnyContent, Results}
 
@@ -18,13 +23,13 @@ import scala.util.{Failure, Success, Try}
 @Singleton
 class ShareCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     shareSrv: ShareSrv,
     organisationSrv: OrganisationSrv,
     caseSrv: CaseSrv,
     taskSrv: TaskSrv,
     observableSrv: ObservableSrv,
-    profileSrv: ProfileSrv
+    profileSrv: ProfileSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) {
 
   def shareCase(caseId: String): Action[AnyContent] =
@@ -129,11 +134,11 @@ class ShareCtrl @Inject() (
       }
 
   private def doRemoveShare(shareId: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-    if (!shareSrv.get(shareId).`case`.can(Permissions.manageShare).exists())
+    if (!shareSrv.get(shareId).`case`.can(Permissions.manageShare).exists)
       Failure(AuthorizationError("You are not authorized to remove share"))
-    else if (shareSrv.get(shareId).byOrganisationName(authContext.organisation).exists())
+    else if (shareSrv.get(shareId).byOrganisationName(authContext.organisation).exists)
       Failure(AuthorizationError("You can't remove your share"))
-    else if (shareSrv.get(shareId).has("owner", true).exists())
+    else if (shareSrv.get(shareId).has("owner", true).exists)
       Failure(AuthorizationError("You can't remove initial shares"))
     else
       shareSrv.remove(shareId)
@@ -143,7 +148,7 @@ class ShareCtrl @Inject() (
       .extract("profile", FieldsParser.string.on("profile"))
       .authTransaction(db) { implicit request => implicit graph =>
         val profile: String = request.body("profile")
-        if (!shareSrv.get(shareId).`case`.can(Permissions.manageShare).exists())
+        if (!shareSrv.get(shareId).`case`.can(Permissions.manageShare).exists)
           Failure(AuthorizationError("You are not authorized to remove share"))
         for {
           richShare <- shareSrv.get(shareId).richShare.getOrFail("Share")
@@ -165,7 +170,7 @@ class ShareCtrl @Inject() (
           .shares
           .filter(_.organisation.hasNot("name", request.organisation).visible)
           .richShare
-          .toList
+          .toSeq
 
         Success(Results.Ok(shares.toJson))
       }
@@ -180,7 +185,7 @@ class ShareCtrl @Inject() (
           .filter(_.organisation.hasNot("name", request.organisation).visible)
           .byTask(taskId)
           .richShare
-          .toList
+          .toSeq
 
         Success(Results.Ok(shares.toJson))
       }
@@ -195,7 +200,7 @@ class ShareCtrl @Inject() (
           .filter(_.organisation.hasNot("name", request.organisation).visible)
           .byObservable(observableId)
           .richShare
-          .toList
+          .toSeq
 
         Success(Results.Ok(shares.toJson))
       }
@@ -208,7 +213,7 @@ class ShareCtrl @Inject() (
 
         for {
           task          <- taskSrv.getOrFail(taskId)
-          _             <- taskSrv.get(task).`case`.can(Permissions.manageShare).existsOrFail()
+          _             <- taskSrv.get(task).`case`.can(Permissions.manageShare).existsOrFail
           organisations <- organisationIds.toTry(organisationSrv.get(_).visible.getOrFail("Organisation"))
           _             <- shareSrv.addTaskShares(task, organisations)
         } yield Results.NoContent
@@ -221,7 +226,7 @@ class ShareCtrl @Inject() (
         val organisationIds: Seq[String] = request.body("organisations")
         for {
           observable    <- observableSrv.getOrFail(observableId)
-          _             <- observableSrv.get(observable).`case`.can(Permissions.manageShare).existsOrFail()
+          _             <- observableSrv.get(observable).`case`.can(Permissions.manageShare).existsOrFail
           organisations <- organisationIds.toTry(organisationSrv.get(_).visible.getOrFail("Organisation"))
           _             <- shareSrv.addObservableShares(observable, organisations)
         } yield Results.NoContent
diff --git a/thehive/app/org/thp/thehive/controllers/v0/StatsCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/StatsCtrl.scala
index 6be624c919..e86c8ac16b 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/StatsCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/StatsCtrl.scala
@@ -27,19 +27,19 @@ class StatsCtrl @Inject() (
             for {
               model <- FieldsParser.string(s.get("model"))
               queryCtrl = model match {
-                case "case"         => queryExecutor.`case`
-                case "task"         => queryExecutor.task
-                case "log"          => queryExecutor.log
-                case "alert"        => queryExecutor.alert
-                case "user"         => queryExecutor.user
-                case "caseTemplate" => queryExecutor.caseTemplate
-                case "observable"   => queryExecutor.observable
-                case "dashboard"    => queryExecutor.dashboard
-                case "organisation" => queryExecutor.organisation
-                case "audit"        => queryExecutor.audit
-                case "profile"      => queryExecutor.profile
-                case "tag"          => queryExecutor.tag
-                case "page"         => queryExecutor.page
+                case "case"          => queryExecutor.`case`
+                case "case_task"     => queryExecutor.task
+                case "case_task_log" => queryExecutor.log
+                case "alert"         => queryExecutor.alert
+                case "user"          => queryExecutor.user
+                case "caseTemplate"  => queryExecutor.caseTemplate
+                case "case_artifact" => queryExecutor.observable
+                case "dashboard"     => queryExecutor.dashboard
+                case "organisation"  => queryExecutor.organisation
+                case "audit"         => queryExecutor.audit
+                case "profile"       => queryExecutor.profile
+                case "tag"           => queryExecutor.tag
+                case "page"          => queryExecutor.page
               }
               queries <- queryCtrl.statsParser(s)
             } yield queries
diff --git a/thehive/app/org/thp/thehive/controllers/v0/StreamCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/StreamCtrl.scala
index 2521a5fb28..bfb4899386 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/StreamCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/StreamCtrl.scala
@@ -4,8 +4,9 @@ import javax.inject.{Inject, Named, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.Order
 import org.thp.scalligraph.controllers.Entrypoint
 import org.thp.scalligraph.models.{Database, Schema}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.controllers.v0.Conversion._
+import org.thp.thehive.services.AuditOps._
 import org.thp.thehive.services._
 import play.api.libs.json.{JsArray, JsObject, Json}
 import play.api.mvc.{Action, AnyContent, Results}
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
index 6a6d992c4d..2b2de10a1b 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TagCtrl.scala
@@ -3,15 +3,17 @@ package org.thp.thehive.controllers.v0
 import java.nio.file.Files
 
 import javax.inject.{Inject, Named}
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.RichSeq
 import org.thp.scalligraph.controllers.{Entrypoint, FFile, FieldsParser, Renderer}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PublicProperty, Query}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{PagedResult, Traversal}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.models.{Permissions, Tag}
-import org.thp.thehive.services.{TagSrv, TagSteps}
+import org.thp.thehive.services.TagOps._
+import org.thp.thehive.services.TagSrv
 import play.api.libs.json.{JsNumber, JsObject, JsValue, Json}
 import play.api.mvc.{Action, AnyContent, Results}
 
@@ -24,25 +26,25 @@ class TagCtrl @Inject() (
     tagSrv: TagSrv
 ) extends QueryableCtrl {
   override val entityName: String                           = "tag"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.tag ::: metaProperties[TagSteps]
-  override val initialQuery: Query                          = Query.init[TagSteps]("listTag", (graph, _) => tagSrv.initSteps(graph))
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, TagSteps, PagedResult[Tag with Entity]](
+  override val publicProperties: List[PublicProperty[_, _]] = properties.tag
+  override val initialQuery: Query                          = Query.init[Traversal.V[Tag]]("listTag", (graph, _) => tagSrv.startTraversal(graph))
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Tag], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, tagSteps, _) => tagSteps.page(range.from, range.to, withTotal = true)
   )
   override val outputQuery: Query = Query.output[Tag with Entity]
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, TagSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Tag]](
     "getTag",
     FieldsParser[IdOrName],
     (param, graph, _) => tagSrv.get(param.idOrName)(graph)
   )
-  implicit val stringRenderer: Renderer.Aux[String, String] = Renderer.json[String, String](identity)
+  implicit val stringRenderer: Renderer[String] = Renderer.toJson[String, String](identity)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[TagSteps, TagSteps]("fromCase", (tagSteps, _) => tagSteps.fromCase),
-    Query[TagSteps, TagSteps]("fromObservable", (tagSteps, _) => tagSteps.fromObservable),
-    Query[TagSteps, Traversal[String, String]]("text", (tagSteps, _) => tagSteps.displayName),
-    Query.output[String, Traversal[String, String]]
+    Query[Traversal.V[Tag], Traversal.V[Tag]]("fromCase", (tagSteps, _) => tagSteps.fromCase),
+    Query[Traversal.V[Tag], Traversal.V[Tag]]("fromObservable", (tagSteps, _) => tagSteps.fromObservable),
+    Query[Traversal.V[Tag], Traversal[String, Vertex, Converter[String, Vertex]]]("text", (tagSteps, _) => tagSteps.displayName),
+    Query.output[String, Traversal[String, Vertex, Converter[String, Vertex]]]
   )
 
   def importTaxonomy: Action[AnyContent] =
@@ -57,7 +59,7 @@ class TagCtrl @Inject() (
           content.fold(Seq.empty[Tag])(parseTaxonomy)
 
         tags
-          .filterNot(tagSrv.initSteps.getTag(_).exists())
+          .filterNot(tagSrv.startTraversal.getTag(_).exists)
           .toTry(tagSrv.create)
           .map(ts => Results.Ok(JsNumber(ts.size)))
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
index 109101553b..d07c92f6d0 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
@@ -5,11 +5,15 @@ import org.thp.scalligraph.RichOptionTry
 import org.thp.scalligraph.controllers._
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputTask
-import org.thp.thehive.models.{Permissions, RichCase, RichTask}
+import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services._
 import play.api.Logger
 import play.api.mvc.{Action, AnyContent, Results}
@@ -28,26 +32,29 @@ class TaskCtrl @Inject() (
 
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "task"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.task ::: metaProperties[TaskSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.task
   override val initialQuery: Query =
-    Query.init[TaskSteps]("listTask", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks)
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, TaskSteps, PagedResult[(RichTask, Option[RichCase])]](
+    Query.init[Traversal.V[Task]]("listTask", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks)
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Task], IteratorOutput](
     "page",
     FieldsParser[OutputParam], {
-      case (OutputParam(from, to, _, 0), taskSteps, _) => taskSteps.richPage(from, to, withTotal = true)(_.richTask.map(_ -> None))
+      case (OutputParam(from, to, _, 0), taskSteps, _) =>
+        taskSteps.richPage(from, to, withTotal = true)(_.richTask.domainMap(_ -> (None: Option[RichCase])))
       case (OutputParam(from, to, _, _), taskSteps, authContext) =>
-        taskSteps.richPage(from, to, withTotal = true)(_.richTaskWithCustomRenderer(_.`case`.richCase(authContext).map(c => Some(c))))
+        taskSteps.richPage(from, to, withTotal = true)(
+          _.richTaskWithCustomRenderer(_.`case`.richCase(authContext).domainMap(c => Some(c): Option[RichCase]))
+        )
     }
   )
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, TaskSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Task]](
     "getTask",
     FieldsParser[IdOrName],
     (param, graph, authContext) => taskSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val outputQuery: Query = Query.output[RichTask, TaskSteps](_.richTask)
+  override val outputQuery: Query = Query.output[RichTask, Traversal.V[Task]](_.richTask)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
     Query.output[(RichTask, Option[RichCase])],
-    Query[TaskSteps, UserSteps]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext))
+    Query[Traversal.V[Task], Traversal.V[User]]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext))
   )
 
   def create(caseId: String): Action[AnyContent] =
@@ -71,7 +78,7 @@ class TaskCtrl @Inject() (
           .getByIds(taskId)
           .visible
           .richTask
-          .getOrFail()
+          .getOrFail("Task")
           .map { task =>
             Results.Ok(task.toJson)
           }
@@ -92,7 +99,7 @@ class TaskCtrl @Inject() (
             case (taskSteps, _) =>
               taskSteps
                 .richTask
-                .getOrFail()
+                .getOrFail("Task")
                 .map(richTask => Results.Ok(richTask.toJson))
           }
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala b/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
index e84d0dd953..99eb5fabbb 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
@@ -6,10 +6,15 @@ import org.thp.scalligraph.BadRequestError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.{FObject, Field, FieldsParser}
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.query.{InputFilter, _}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{BaseTraversal, BaseVertexSteps}
-import org.thp.thehive.services.{ObservableSteps, _}
+import org.thp.scalligraph.query._
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.utils.RichType
+import org.thp.thehive.models.{Case, Log, Observable, Task}
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.TaskOps._
 
 import scala.reflect.runtime.{universe => ru}
 
@@ -49,17 +54,26 @@ class TheHiveQueryExecutor @Inject() (
 
   lazy val controllers: List[QueryableCtrl] =
     caseCtrl :: taskCtrl :: logCtrl :: observableCtrl :: alertCtrl :: userCtrl :: caseTemplateCtrl :: dashboardCtrl :: organisationCtrl :: auditCtrl :: profileCtrl :: tagCtrl :: pageCtrl :: observableTypeCtrl :: Nil
-  override lazy val publicProperties: List[PublicProperty[_, _]] = controllers.flatMap(_.publicProperties)
+
+  def metaProperties: List[PublicProperty[_, _]] =
+    PublicPropertyListBuilder[Product]
+      .property("createdBy", UMapping.string)(_.rename("_createdBy").readonly)
+      .property("createdAt", UMapping.date)(_.rename("_createdAt").readonly)
+      .property("updatedBy", UMapping.string.optional)(_.rename("_updatedBy").readonly)
+      .property("updatedAt", UMapping.date.optional)(_.rename("_updatedAt").readonly)
+      .build
+
+  override lazy val publicProperties: List[PublicProperty[_, _]] = controllers.flatMap(_.publicProperties) ::: metaProperties
 
   val childTypes: PartialFunction[(ru.Type, String), ru.Type] = {
-    case (tpe, "case_task_log") if SubType(tpe, ru.typeOf[TaskSteps]) => ru.typeOf[LogSteps]
-    case (tpe, "case_task") if SubType(tpe, ru.typeOf[CaseSteps])     => ru.typeOf[TaskSteps]
-    case (tpe, "case_artifact") if SubType(tpe, ru.typeOf[CaseSteps]) => ru.typeOf[ObservableSteps]
+    case (tpe, "case_task_log") if SubType(tpe, ru.typeOf[Traversal.V[Task]]) => ru.typeOf[Traversal.V[Log]]
+    case (tpe, "case_task") if SubType(tpe, ru.typeOf[Traversal.V[Case]])     => ru.typeOf[Traversal.V[Task]]
+    case (tpe, "case_artifact") if SubType(tpe, ru.typeOf[Traversal.V[Case]]) => ru.typeOf[Traversal.V[Observable]]
   }
   val parentTypes: PartialFunction[ru.Type, ru.Type] = {
-    case tpe if SubType(tpe, ru.typeOf[TaskSteps])       => ru.typeOf[CaseSteps]
-    case tpe if SubType(tpe, ru.typeOf[ObservableSteps]) => ru.typeOf[CaseSteps]
-    case tpe if SubType(tpe, ru.typeOf[LogSteps])        => ru.typeOf[ObservableSteps]
+    case tpe if SubType(tpe, ru.typeOf[Traversal.V[Task]])       => ru.typeOf[Traversal.V[Case]]
+    case tpe if SubType(tpe, ru.typeOf[Traversal.V[Observable]]) => ru.typeOf[Traversal.V[Case]]
+    case tpe if SubType(tpe, ru.typeOf[Traversal.V[Log]])        => ru.typeOf[Traversal.V[Observable]]
   }
   override val customFilterQuery: FilterQuery = FilterQuery(db, publicProperties) { (tpe, globalParser) =>
     FieldsParser.debug("parentChildFilter") {
@@ -106,18 +120,24 @@ object ParentIdFilter {
       .fold(Some(_), _ => None)
 }
 
-class ParentIdInputFilter(parentId: String) extends InputFilter {
-  override def apply[S <: BaseTraversal](
+class ParentIdInputFilter(parentId: String) extends InputQuery[Traversal.Unk, Traversal.Unk] {
+  override def apply(
       db: Database,
       publicProperties: List[PublicProperty[_, _]],
-      stepType: ru.Type,
-      step: S,
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
       authContext: AuthContext
-  ): S =
-    if (stepType =:= ru.typeOf[TaskSteps]) step.asInstanceOf[TaskSteps].filter(_.`case`.getByIds(parentId)).asInstanceOf[S]
-    else if (stepType =:= ru.typeOf[ObservableSteps]) step.asInstanceOf[ObservableSteps].filter(_.`case`.getByIds(parentId)).asInstanceOf[S]
-    else if (stepType =:= ru.typeOf[LogSteps]) step.asInstanceOf[LogSteps].filter(_.task.getByIds(parentId)).asInstanceOf[S]
-    else throw BadRequestError(s"$stepType hasn't parent")
+  ): Traversal.Unk =
+    RichType
+      .getTypeArgs(traversalType, ru.typeOf[Traversal[_, _, _]])
+      .headOption
+      .collect {
+        case t if t <:< ru.typeOf[Task] => traversal.asInstanceOf[Traversal.V[Task]].filter(_.`case`.getByIds(parentId)).asInstanceOf[Traversal.Unk]
+        case t if t <:< ru.typeOf[Observable] =>
+          traversal.asInstanceOf[Traversal.V[Observable]].filter(_.`case`.getByIds(parentId)).asInstanceOf[Traversal.Unk]
+        case t if t <:< ru.typeOf[Log] => traversal.asInstanceOf[Traversal.V[Log]].filter(_.task.getByIds(parentId)).asInstanceOf[Traversal.Unk]
+      }
+      .getOrElse(throw BadRequestError(s"$traversalType hasn't parent"))
 }
 
 object ParentQueryFilter {
@@ -131,21 +151,33 @@ object ParentQueryFilter {
       .fold(Some(_), _ => None)
 }
 
-class ParentQueryInputFilter(parentFilter: InputFilter) extends InputFilter {
-  override def apply[S <: BaseTraversal](
+class ParentQueryInputFilter(parentFilter: InputQuery[Traversal.Unk, Traversal.Unk]) extends InputQuery[Traversal.Unk, Traversal.Unk] {
+  override def apply(
       db: Database,
       publicProperties: List[PublicProperty[_, _]],
-      stepType: ru.Type,
-      step: S,
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
       authContext: AuthContext
-  ): S =
-    if (stepType =:= ru.typeOf[TaskSteps])
-      step.filter(t => parentFilter.apply(db, publicProperties, ru.typeOf[CaseSteps], t.asInstanceOf[TaskSteps].`case`, authContext))
-    else if (stepType =:= ru.typeOf[ObservableSteps])
-      step.filter(t => parentFilter.apply(db, publicProperties, ru.typeOf[CaseSteps], t.asInstanceOf[ObservableSteps].`case`, authContext))
-    else if (stepType =:= ru.typeOf[LogSteps])
-      step.filter(t => parentFilter.apply(db, publicProperties, ru.typeOf[TaskSteps], t.asInstanceOf[LogSteps].task, authContext))
-    else throw BadRequestError(s"$stepType hasn't parent")
+  ): Traversal.Unk = {
+    def filter[F, T: ru.TypeTag](t: Traversal.V[F] => Traversal.V[T]): Traversal.Unk =
+      parentFilter(
+        db,
+        publicProperties,
+        ru.typeOf[Traversal.V[T]],
+        t(traversal.asInstanceOf[Traversal.V[F]]).asInstanceOf[Traversal.Unk],
+        authContext
+      )
+
+    RichType
+      .getTypeArgs(traversalType, ru.typeOf[Traversal[_, _, _]])
+      .headOption
+      .collect {
+        case t if t <:< ru.typeOf[Task]       => filter[Task, Case](_.`case`)
+        case t if t <:< ru.typeOf[Observable] => filter[Observable, Case](_.`case`)
+        case t if t <:< ru.typeOf[Log]        => filter[Log, Task](_.task)
+      }
+      .getOrElse(throw BadRequestError(s"$traversalType hasn't parent"))
+  }
 }
 
 object ChildQueryFilter {
@@ -158,21 +190,32 @@ object ChildQueryFilter {
       .fold(Some(_), _ => None)
 }
 
-class ChildQueryInputFilter(childType: String, childFilter: InputFilter) extends InputFilter {
-  override def apply[S <: BaseVertexSteps](
+class ChildQueryInputFilter(childType: String, childFilter: InputQuery[Traversal.Unk, Traversal.Unk])
+    extends InputQuery[Traversal.Unk, Traversal.Unk] {
+  override def apply(
       db: Database,
       publicProperties: List[PublicProperty[_, _]],
-      stepType: ru.Type,
-      step: S,
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
       authContext: AuthContext
-  ): S =
-    if (stepType =:= ru.typeOf[CaseSteps] && childType == "case_task")
-      step.filter(t => childFilter.apply(db, publicProperties, ru.typeOf[TaskSteps], t.asInstanceOf[CaseSteps].tasks(authContext), authContext))
-    else if (stepType =:= ru.typeOf[CaseSteps] && childType == "case_artifact")
-      step.filter(t =>
-        childFilter.apply(db, publicProperties, ru.typeOf[ObservableSteps], t.asInstanceOf[CaseSteps].observables(authContext), authContext)
+  ): Traversal.Unk = {
+    def filter[F, T: ru.TypeTag](t: Traversal.V[F] => Traversal.V[T]): Traversal.Unk =
+      childFilter(
+        db,
+        publicProperties,
+        ru.typeOf[Traversal.V[T]],
+        t(traversal.asInstanceOf[Traversal.V[F]]).asInstanceOf[Traversal.Unk],
+        authContext
       )
-    else if (stepType =:= ru.typeOf[TaskSteps] && childType == "case_task_log")
-      step.filter(t => childFilter.apply(db, publicProperties, ru.typeOf[LogSteps], t.asInstanceOf[TaskSteps].logs, authContext))
-    else throw BadRequestError(s"$stepType hasn't child of type $childType")
+
+    RichType
+      .getTypeArgs(traversalType, ru.typeOf[Traversal[_, _, _]])
+      .headOption
+      .collect {
+        case t if t <:< ru.typeOf[Case] && childType == "case_task"     => filter[Case, Task](_.tasks(authContext))
+        case t if t <:< ru.typeOf[Case] && childType == "case_artifact" => filter[Case, Observable](_.observables(authContext))
+        case t if t <:< ru.typeOf[Task] && childType == "case_task_log" => filter[Task, Log](_.logs)
+      }
+      .getOrElse(throw BadRequestError(s"$traversalType hasn't child $childType"))
+  }
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala
index 33527af033..101f918f96 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala
@@ -5,52 +5,52 @@ import org.thp.scalligraph.auth.AuthSrv
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.scalligraph.{AuthorizationError, RichOptionTry}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputUser
 import org.thp.thehive.models._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.Logger
 import play.api.libs.json.Json
 import play.api.mvc.{Action, AnyContent, Results}
 
-import scala.concurrent.ExecutionContext
 import scala.util.{Failure, Success}
 
 @Singleton
 class UserCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     userSrv: UserSrv,
     profileSrv: ProfileSrv,
     authSrv: AuthSrv,
     organisationSrv: OrganisationSrv,
     auditSrv: AuditSrv,
-    implicit val ec: ExecutionContext
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "user"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.user ::: metaProperties[UserSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.user
 
   override val initialQuery: Query =
-    Query.init[UserSteps]("listUser", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).users)
+    Query.init[Traversal.V[User]]("listUser", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).users)
 
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, UserSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[User]](
     "getUser",
     FieldsParser[IdOrName],
     (param, graph, authContext) => userSrv.get(param.idOrName)(graph).visible(authContext)
   )
 
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, UserSteps, PagedResult[RichUser]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[User], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, userSteps, authContext) => userSteps.richUser(authContext).page(range.from, range.to, withTotal = true)
   )
   override val outputQuery: Query =
-    Query.outputWithContext[RichUser, UserSteps]((userSteps, authContext) => userSteps.richUser(authContext))
+    Query.outputWithContext[RichUser, Traversal.V[User]]((userSteps, authContext) => userSteps.richUser(authContext))
 
   override val extraQueries: Seq[ParamQuery[_]] = Seq()
 
@@ -76,26 +76,26 @@ class UserCtrl @Inject() (
       .auth { implicit request =>
         val inputUser: InputUser = request.body("user")
         db.tryTransaction { implicit graph =>
-            val organisationName = inputUser.organisation.getOrElse(request.organisation)
-            for {
-              _            <- userSrv.current.organisations(Permissions.manageUser).get(organisationName).existsOrFail()
-              organisation <- organisationSrv.getOrFail(organisationName)
-              profile <- if (inputUser.roles.contains("admin")) profileSrv.getOrFail(Profile.admin.name)
+          val organisationName = inputUser.organisation.getOrElse(request.organisation)
+          for {
+            _            <- userSrv.current.organisations(Permissions.manageUser).get(organisationName).existsOrFail
+            organisation <- organisationSrv.getOrFail(organisationName)
+            profile <-
+              if (inputUser.roles.contains("admin")) profileSrv.getOrFail(Profile.admin.name)
               else if (inputUser.roles.contains("write")) profileSrv.getOrFail(Profile.analyst.name)
               else if (inputUser.roles.contains("read")) profileSrv.getOrFail(Profile.readonly.name)
               else profileSrv.getOrFail(Profile.readonly.name)
-              user <- userSrv.addOrCreateUser(inputUser.toUser, inputUser.avatar, organisation, profile)
-            } yield user -> userSrv.canSetPassword(user.user)
-          }
-          .flatMap {
-            case (user, true) =>
-              inputUser
-                .password
-                .map(password => authSrv.setPassword(user._id, password))
-                .flip
-                .map(_ => Results.Created(user.toJson))
-            case (user, _) => Success(Results.Created(user.toJson))
-          }
+            user <- userSrv.addOrCreateUser(inputUser.toUser, inputUser.avatar, organisation, profile)
+          } yield user -> userSrv.canSetPassword(user.user)
+        }.flatMap {
+          case (user, true) =>
+            inputUser
+              .password
+              .map(password => authSrv.setPassword(user._id, password))
+              .flip
+              .map(_ => Results.Created(user.toJson))
+          case (user, _) => Success(Results.Created(user.toJson))
+        }
       }
 
   def lock(userId: String): Action[AnyContent] =
@@ -134,9 +134,10 @@ class UserCtrl @Inject() (
       .authTransaction(db) { implicit request => implicit graph =>
         val propertyUpdaters: Seq[PropertyUpdater] = request.body("user")
         for {
-          user <- userSrv
-            .update(userSrv.get(userId), propertyUpdaters) // Authorisation is managed in public properties
-            .flatMap { case (user, _) => user.richUser(request.organisation).getOrFail("User") }
+          user <-
+            userSrv
+              .update(userSrv.get(userId), propertyUpdaters) // Authorisation is managed in public properties
+              .flatMap { case (user, _) => user.richUser(request.organisation).getOrFail("User") }
         } yield Results.Ok(user.toJson)
 
       }
@@ -155,7 +156,7 @@ class UserCtrl @Inject() (
                   .current
                   .organisations(Permissions.manageUser)
                   .users
-                  .get(u)
+                  .getByIds(u._id)
                   .getOrFail("User")
               }
           }
@@ -169,13 +170,13 @@ class UserCtrl @Inject() (
       .extract("password", FieldsParser[String].on("password"))
       .extract("currentPassword", FieldsParser[String].on("currentPassword"))
       .auth { implicit request =>
-        if (userId == request.userId) {
+        if (userId == request.userId)
           for {
             user <- db.roTransaction(implicit graph => userSrv.get(userId).getOrFail("User"))
             _    <- authSrv.changePassword(userId, request.body("currentPassword"), request.body("password"))
             _    <- db.tryTransaction(implicit graph => auditSrv.user.update(user, Json.obj("password" -> "<hidden>")))
           } yield Results.NoContent
-        } else Failure(AuthorizationError(s"You are not authorized to change password of $userId"))
+        else Failure(AuthorizationError(s"You are not authorized to change password of $userId"))
       }
 
   def getKey(userId: String): Action[AnyContent] =
@@ -191,12 +192,13 @@ class UserCtrl @Inject() (
                   .current
                   .organisations(Permissions.manageUser)
                   .users
-                  .get(u)
+                  .getByIds(u._id)
                   .getOrFail("User")
               }
           }
-          key <- authSrv
-            .getKey(user._id)
+          key <-
+            authSrv
+              .getKey(user._id)
         } yield Results.Ok(key)
       }
 
@@ -213,7 +215,7 @@ class UserCtrl @Inject() (
                   .current
                   .organisations(Permissions.manageUser)
                   .users
-                  .get(u)
+                  .getByIds(u._id)
                   .getOrFail("User")
               }
           }
@@ -236,7 +238,7 @@ class UserCtrl @Inject() (
                   .current
                   .organisations(Permissions.manageUser)
                   .users
-                  .get(u)
+                  .getByIds(u._id)
                   .getOrFail("User")
               }
           }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala
index 4430975468..b37fa2f50b 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala
@@ -1,55 +1,61 @@
 package org.thp.thehive.controllers.v1
 
+import java.util.{Map => JMap}
+
 import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.{PagedResult, Traversal}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputAlert
-import org.thp.thehive.models.{Permissions, RichAlert}
+import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
-import play.api.libs.json.{JsObject, JsValue, Json}
+import play.api.libs.json.{JsValue, Json}
 import play.api.mvc.{Action, AnyContent, Results}
 
 @Singleton
 class AlertCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     alertSrv: AlertSrv,
     caseTemplateSrv: CaseTemplateSrv,
     userSrv: UserSrv,
-    organisationSrv: OrganisationSrv
+    organisationSrv: OrganisationSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl
     with AlertRenderer {
 
   override val entityName: String                           = "alert"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.alert ::: metaProperties[AlertSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.alert
   override val initialQuery: Query =
-    Query.init[AlertSteps]("listAlert", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).alerts)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, AlertSteps](
+    Query.init[Traversal.V[Alert]]("listAlert", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).alerts)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Alert]](
     "getAlert",
     FieldsParser[IdOrName],
     (param, graph, authContext) => alertSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, AlertSteps, PagedResult[(RichAlert, JsObject)]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Alert], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, alertSteps, authContext) =>
       alertSteps
         .richPage(range.from, range.to, range.extraData.contains("total"))(
-          _.richAlertWithCustomRenderer(alertStatsRenderer(range.extraData)(authContext, db, alertSteps.graph))(authContext)
+          _.richAlertWithCustomRenderer(alertStatsRenderer(range.extraData)(authContext))
         )
   )
-  override val outputQuery: Query = Query.output[RichAlert, AlertSteps](_.richAlert)
+  override val outputQuery: Query = Query.output[RichAlert, Traversal.V[Alert]](_.richAlert)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[AlertSteps, ObservableSteps]("observables", (alertSteps, _) => alertSteps.observables),
-    Query[AlertSteps, CaseSteps]("case", (alertSteps, _) => alertSteps.`case`),
-    Query[AlertSteps, Traversal[JsValue, JsValue]](
+    Query[Traversal.V[Alert], Traversal.V[Observable]]("observables", (alertSteps, _) => alertSteps.observables),
+    Query[Traversal.V[Alert], Traversal.V[Case]]("case", (alertSteps, _) => alertSteps.`case`),
+    Query[Traversal.V[Alert], Traversal[JsValue, JMap[String, Any], Converter[JsValue, JMap[String, Any]]]](
       "similarCases",
-      (alertSteps, authContext) => alertSteps.similarCases(authContext).map(Json.toJson(_))
+      (alertSteps, authContext) => alertSteps.similarCases(authContext).domainMap(Json.toJson(_))
     )
   )
 
@@ -60,7 +66,7 @@ class AlertCtrl @Inject() (
       .authTransaction(db) { implicit request => implicit graph =>
         val caseTemplateName: Option[String] = request.body("caseTemplate")
         val inputAlert: InputAlert           = request.body("alert")
-        val caseTemplate                     = caseTemplateName.flatMap(ct => caseTemplateSrv.get(ct).visible.headOption())
+        val caseTemplate                     = caseTemplateName.flatMap(ct => caseTemplateSrv.get(ct).visible.headOption)
         for {
           organisation <- userSrv.current.organisations(Permissions.manageAlert).getOrFail("Organisation")
           customFields = inputAlert.customFieldValue.map(cf => cf.name -> cf.value).toMap
@@ -101,7 +107,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .getOrFail()
+          .getOrFail("Alert")
           .map { alert =>
             alertSrv.markAsRead(alert._id)
             Results.NoContent
@@ -114,7 +120,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .getOrFail()
+          .getOrFail("Alert")
           .map { alert =>
             alertSrv.markAsUnread(alert._id)
             Results.NoContent
@@ -136,7 +142,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .getOrFail()
+          .getOrFail("Alert")
           .map { alert =>
             alertSrv.followAlert(alert._id)
             Results.NoContent
@@ -149,7 +155,7 @@ class AlertCtrl @Inject() (
         alertSrv
           .get(alertId)
           .can(Permissions.manageAlert)
-          .getOrFail()
+          .getOrFail("Alert")
           .map { alert =>
             alertSrv.unfollowAlert(alert._id)
             Results.NoContent
diff --git a/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala
index 04e8e7ef47..d08472cd0b 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/AlertRenderer.scala
@@ -1,18 +1,15 @@
 package org.thp.thehive.controllers.v1
 
-import java.util.{Map => JMap}
+import java.util.{List => JList, Map => JMap}
 
-import gremlin.scala.{__, Graph, GremlinScala, Vertex}
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
-import org.thp.thehive.models.{RichCase, SimilarStats}
-import org.thp.thehive.services.AlertSteps
+import org.thp.thehive.models.{Alert, RichCase, SimilarStats}
+import org.thp.thehive.services.AlertOps._
 import play.api.libs.json._
 
-import scala.collection.JavaConverters._
 trait AlertRenderer {
   implicit val similarCaseWrites: Writes[(RichCase, SimilarStats)] = Writes[(RichCase, SimilarStats)] {
     case (richCase, similarStats) =>
@@ -24,7 +21,9 @@ trait AlertRenderer {
         "iocCount"               -> similarStats.ioc._2
       )
   }
-  def similarCasesStats(alertSteps: AlertSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] = {
+  def similarCasesStats(
+      implicit authContext: AuthContext
+  ): Traversal.V[Alert] => Traversal[JsArray, JList[JMap[String, Any]], Converter[JsArray, JList[JMap[String, Any]]]] = {
     implicit val similarCaseOrdering: Ordering[(RichCase, SimilarStats)] = (x: (RichCase, SimilarStats), y: (RichCase, SimilarStats)) =>
       //negative if x < y
       if (x._1._createdAt after y._1._createdAt) -1
@@ -36,26 +35,35 @@ trait AlertRenderer {
       else if (x._2.ioc._2 > y._2.ioc._2) -1
       else if (x._2.ioc._2 < y._2.ioc._2) 1
       else 0
-    alertSteps.similarCases.fold.map(sc => JsArray(sc.asScala.sorted.map(Json.toJson(_))))
+    _.similarCases.fold.domainMap(sc => JsArray(sc.sorted.map(Json.toJson(_))))
   }
 
-  def alertStatsRenderer(extraData: Set[String])(
-      implicit authContext: AuthContext,
-      db: Database,
-      graph: Graph
-  ): AlertSteps => Traversal[JsObject, JsObject] = {
-    def addData(f: AlertSteps => Traversal[JsValue, JsValue]): GremlinScala[JMap[String, JsValue]] => GremlinScala[JMap[String, JsValue]] =
-      _.by(f(new AlertSteps(__[Vertex])).raw.traversal)
+  def alertStatsRenderer[D, G, C <: Converter[D, G]](extraData: Set[String])(
+      implicit authContext: AuthContext
+  ): Traversal.V[Alert] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { traversal =>
+    def addData[T](
+        name: String
+    )(f: Traversal.V[Alert] => Traversal[JsValue, T, Converter[JsValue, T]]): Traversal[JsObject, JMap[String, Any], Converter[
+      JsObject,
+      JMap[String, Any]
+    ]] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { t =>
+      val dataTraversal = f(traversal.start)
+      t.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.by(dataTraversal.raw)) { jmap =>
+        t.converter(jmap) + (name -> dataTraversal.converter(jmap.get(name).asInstanceOf[T]))
+      }
+    }
 
-    if (extraData.isEmpty) _.constant(JsObject.empty)
+    if (extraData.isEmpty) traversal.constant2(JsObject.empty)
     else {
       val dataName = extraData.toSeq
-      dataName
-        .foldLeft[AlertSteps => GremlinScala[JMap[String, JsValue]]](_.raw.project(dataName.head, dataName.tail: _*)) {
-          case (f, "similarCases") => f.andThen(addData(similarCasesStats))
-          case (f, _)              => f.andThen(_.by(__.constant(JsNull).traversal))
-        }
-        .andThen(f => Traversal(f.map(m => JsObject(m.asScala))))
+      dataName.foldLeft[Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]]](
+        traversal.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.project(dataName.head, dataName.tail: _*))(_ =>
+          JsObject.empty
+        )
+      ) {
+        case (f, "similarCases") => addData("similarCases")(similarCasesStats)(f)
+        case (f, _)              => f
+      }
     }
   }
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/AuditCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AuditCtrl.scala
index 5dcaabf6f5..bf9d210fcf 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/AuditCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/AuditCtrl.scala
@@ -4,11 +4,12 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Schema}
 import org.thp.scalligraph.query.{ParamQuery, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
-import org.thp.thehive.models.RichAudit
-import org.thp.thehive.services.{AuditSrv, AuditSteps, LogSteps}
+import org.thp.thehive.models.{Audit, RichAudit}
+import org.thp.thehive.services.AuditOps._
+import org.thp.thehive.services.AuditSrv
 import play.api.mvc.{Action, AnyContent, Results}
 
 import scala.util.Success
@@ -25,31 +26,31 @@ class AuditCtrl @Inject() (
   val entityName: String = "audit"
 
   val initialQuery: Query =
-    Query.init[AuditSteps]("listAudit", (graph, authContext) => auditSrv.initSteps(graph).visible(authContext))
-  val publicProperties: List[PublicProperty[_, _]] = properties.audit ::: metaProperties[LogSteps]
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, AuditSteps](
+    Query.init[Traversal.V[Audit]]("listAudit", (graph, authContext) => auditSrv.startTraversal(graph).visible(authContext))
+  val publicProperties: List[PublicProperty[_, _]] = properties.audit
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Audit]](
     "getAudit",
     FieldsParser[IdOrName],
     (param, graph, authContext) => auditSrv.get(param.idOrName)(graph).visible(authContext)
   )
 
   val pageQuery: ParamQuery[OutputParam] =
-    Query.withParam[OutputParam, AuditSteps, PagedResult[RichAudit]](
+    Query.withParam[OutputParam, Traversal.V[Audit], IteratorOutput](
       "page",
       FieldsParser[OutputParam],
       (range, auditSteps, _) => auditSteps.richPage(range.from, range.to, range.extraData.contains("total"))(_.richAudit)
     )
-  override val outputQuery: Query = Query.output[RichAudit, AuditSteps](_.richAudit)
+  override val outputQuery: Query = Query.output[RichAudit, Traversal.V[Audit]](_.richAudit)
 
   def flow: Action[AnyContent] =
     entrypoint("audit flow")
       .authRoTransaction(db) { implicit request => implicit graph =>
         val audits = auditSrv
-          .initSteps
+          .startTraversal
           .visible
           .range(0, 10)
           .richAudit
-          .toList
+          .toSeq
 
         Success(Results.Ok(audits.toJson))
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/AuthenticationCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AuthenticationCtrl.scala
index 3e2306e110..a0ebd6b193 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/AuthenticationCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/AuthenticationCtrl.scala
@@ -4,16 +4,16 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.auth.{AuthSrv, RequestOrganisation}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AuthenticationError, AuthorizationError, BadRequestError, MultiFactorCodeRequired}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models.Permissions
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services.{TOTPAuthSrv, UserSrv}
 import play.api.libs.json.Json
 import play.api.mvc.{Action, AnyContent, Results}
 
-import scala.collection.JavaConverters._
-import scala.concurrent.ExecutionContext
 import scala.util.{Failure, Success, Try}
 
 @Singleton
@@ -22,8 +22,7 @@ class AuthenticationCtrl @Inject() (
     authSrv: AuthSrv,
     requestOrganisation: RequestOrganisation,
     userSrv: UserSrv,
-    @Named("with-thehive-schema") db: Database,
-    implicit val ec: ExecutionContext
+    @Named("with-thehive-schema") implicit val db: Database
 ) {
 
   def login: Action[AnyContent] =
@@ -41,7 +40,7 @@ class AuthenticationCtrl @Inject() (
           user <- db.roTransaction { implicit graph =>
             userSrv
               .get(authContext.userId)
-              .richUserWithCustomRenderer(authContext.organisation, _.organisationWithRole.map(_.asScala.toSeq))(authContext)
+              .richUserWithCustomRenderer(authContext.organisation, _.organisationWithRole)
               .getOrFail("User")
           }
           _ <- if (user._1.locked) Failure(AuthorizationError("Your account is locked")) else Success(())
@@ -93,7 +92,7 @@ class AuthenticationCtrl @Inject() (
           userSrv
             .getOrFail(userId.getOrElse(request.userId))
             .flatMap { user =>
-              if (request.userId == user.login || userSrv.current.organisations(Permissions.manageUser).users.get(user._id).exists())
+              if (request.userId == user.login || userSrv.current.organisations(Permissions.manageUser).users.get(user._id).exists)
                 totpAuthSrv.unsetSecret(user.login)
               else Failure(AuthorizationError("You cannot unset TOTP secret of this user"))
             }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
index 3ec3a5e7e6..555b6e69bb 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
@@ -4,14 +4,18 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.scalligraph.{RichOptionTry, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.{InputCase, InputTask}
-import org.thp.thehive.models.{Permissions, RichCase, User}
+import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
-import play.api.libs.json.JsObject
 import play.api.mvc.{Action, AnyContent, Results}
 
 import scala.util.{Success, Try}
@@ -19,41 +23,42 @@ import scala.util.{Success, Try}
 @Singleton
 class CaseCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     caseSrv: CaseSrv,
     caseTemplateSrv: CaseTemplateSrv,
     userSrv: UserSrv,
     tagSrv: TagSrv,
-    organisationSrv: OrganisationSrv
+    organisationSrv: OrganisationSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl
     with CaseRenderer {
 
   override val entityName: String                           = "case"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.`case` ::: metaProperties[CaseSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.`case`
   override val initialQuery: Query =
-    Query.init[CaseSteps]("listCase", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).cases)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, CaseSteps](
+    Query.init[Traversal.V[Case]]("listCase", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).cases)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Case]](
     "getCase",
     FieldsParser[IdOrName],
     (param, graph, authContext) => caseSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, CaseSteps, PagedResult[(RichCase, JsObject)]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Case], IteratorOutput](
     "page",
-    FieldsParser[OutputParam], {
+    FieldsParser[OutputParam],
+    {
       case (OutputParam(from, to, extraData), caseSteps, authContext) =>
         caseSteps.richPage(from, to, extraData.contains("total")) {
-          _.richCaseWithCustomRenderer(caseStatsRenderer(extraData - "total")(authContext, db, caseSteps.graph))(authContext)
+          _.richCaseWithCustomRenderer(caseStatsRenderer(extraData - "total")(authContext))(authContext)
         }
     }
   )
-  override val outputQuery: Query = Query.outputWithContext[RichCase, CaseSteps]((caseSteps, authContext) => caseSteps.richCase(authContext))
+  override val outputQuery: Query = Query.outputWithContext[RichCase, Traversal.V[Case]]((caseSteps, authContext) => caseSteps.richCase(authContext))
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[CaseSteps, TaskSteps]("tasks", (caseSteps, authContext) => caseSteps.tasks(authContext)),
-    Query[CaseSteps, ObservableSteps]("observables", (caseSteps, authContext) => caseSteps.observables(authContext)),
-    Query[CaseSteps, UserSteps]("assignableUsers", (caseSteps, authContext) => caseSteps.assignableUsers(authContext)),
-    Query[CaseSteps, OrganisationSteps]("organisations", (caseSteps, authContext) => caseSteps.organisations.visible(authContext)),
-    Query[CaseSteps, AlertSteps]("alerts", (caseSteps, authContext) => caseSteps.alert.visible(authContext))
+    Query[Traversal.V[Case], Traversal.V[Task]]("tasks", (caseSteps, authContext) => caseSteps.tasks(authContext)),
+    Query[Traversal.V[Case], Traversal.V[Observable]]("observables", (caseSteps, authContext) => caseSteps.observables(authContext)),
+    Query[Traversal.V[Case], Traversal.V[User]]("assignableUsers", (caseSteps, authContext) => caseSteps.assignableUsers(authContext)),
+    Query[Traversal.V[Case], Traversal.V[Organisation]]("organisations", (caseSteps, authContext) => caseSteps.organisations.visible(authContext)),
+    Query[Traversal.V[Case], Traversal.V[Alert]]("alerts", (caseSteps, authContext) => caseSteps.alert.visible(authContext))
   )
 
   def create: Action[AnyContent] =
@@ -78,7 +83,7 @@ class CaseCtrl @Inject() (
             tags.toSet,
             customFields,
             caseTemplate,
-            inputTasks.map(t => t.toTask -> t.assignee.flatMap(userSrv.get(_).headOption()))
+            inputTasks.map(t => t.toTask -> t.assignee.flatMap(userSrv.get(_).headOption))
           )
         } yield Results.Created(richCase.toJson)
       }
@@ -110,7 +115,8 @@ class CaseCtrl @Inject() (
         caseSrv
           .get(caseIdOrNumber)
           .can(Permissions.manageCase)
-          .update("status" -> "deleted")
+          .update(_.status, CaseStatus.Deleted)
+          .getOrFail("Case")
           .map(_ => Results.NoContent)
       }
 
diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala
index d7bf42a44b..5b03ccf93d 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala
@@ -1,91 +1,91 @@
 package org.thp.thehive.controllers.v1
 
-import java.util.{Map => JMap}
+import java.lang.{Long => JLong}
+import java.util.{Collection => JCollection, List => JList, Map => JMap}
 
-import gremlin.scala.{__, By, Graph, GremlinScala, Key, Vertex}
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
-import org.thp.thehive.models.AlertCase
-import org.thp.thehive.services.CaseSteps
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.thehive.models.{Alert, AlertCase, Case}
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
 import play.api.libs.json._
 
-import scala.collection.JavaConverters._
-
 trait CaseRenderer {
 
-  def observableStats(
-      caseSteps: CaseSteps
-  )(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    caseSteps
-      .share
+  def observableStats(implicit authContext: AuthContext): Traversal.V[Case] => Traversal[JsObject, JLong, Converter[JsObject, JLong]] =
+    _.share
       .observables
       .count
-      .map(count => Json.obj("total" -> count))
+      .domainMap(count => Json.obj("total" -> count))
 
-  def taskStats(caseSteps: CaseSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    caseSteps
-      .share
+  def taskStats(implicit
+      authContext: AuthContext
+  ): Traversal.V[Case] => Traversal[JsObject, JMap[String, JLong], Converter[JsObject, JMap[String, JLong]]] =
+    _.share
       .tasks
       .active
-      .groupCount(By(Key[String]("status")))
-      .map { statusAgg =>
-        val (total, result) = statusAgg.asScala.foldLeft(0L -> JsObject.empty) {
-          case ((t, r), (k, v)) => (t + v) -> (r + (k -> JsNumber(v.toInt)))
+      .groupCount(_.byValue(_.status))
+      .domainMap { statusAgg =>
+        val (total, result) = statusAgg.foldLeft(0L -> JsObject.empty) {
+          case ((t, r), (k, v)) => (t + v) -> (r + (k.toString -> JsNumber(v.toInt)))
         }
         result + ("total" -> JsNumber(total))
       }
 
-  def alertStats(caseSteps: CaseSteps): Traversal[JsValue, JsValue] =
-    caseSteps
-      .inTo[AlertCase]
-      .group(By(Key[String]("type")), By(Key[String]("source")))
-      .map { alertAgg =>
-        JsArray(
-          alertAgg
-            .asScala
-            .flatMap {
-              case (tpe, listOfSource) =>
-                listOfSource.asScala.map(s => Json.obj("type" -> tpe, "source" -> s))
-            }
-            .toSeq
-        )
+  def alertStats: Traversal.V[Case] => Traversal[JsArray, JMap[String, JCollection[String]], Converter[JsArray, JMap[String, JCollection[String]]]] =
+    _.in[AlertCase]
+      .v[Alert]
+      .group(_.byValue(_.`type`), _.byValue(_.source))
+      .domainMap { alertAgg =>
+        JsArray((for {
+          (tpe, sources) <- alertAgg
+          source         <- sources
+        } yield Json.obj("type" -> tpe, "source" -> source)).toSeq)
       }
 
-  def isOwnerStats(
-      caseSteps: CaseSteps
-  )(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    caseSteps.origin.has("name", authContext.organisation).fold.map(l => JsBoolean(!l.isEmpty))
+  def isOwnerStats(implicit authContext: AuthContext): Traversal.V[Case] => Traversal[JsBoolean, JList[Vertex], Converter[JsBoolean, JList[Vertex]]] =
+    _.origin.has("name", authContext.organisation).fold.domainMap(l => JsBoolean(l.nonEmpty))
 
-  def shareCountStats(caseSteps: CaseSteps): Traversal[JsValue, JsValue] =
-    caseSteps.organisations.count.map(c => JsNumber(c - 1))
+  def shareCountStats: Traversal.V[Case] => Traversal[JsNumber, JLong, Converter[JsNumber, JLong]] =
+    _.organisations.count.domainMap(c => JsNumber(c - 1))
 
-  def permissions(caseSteps: CaseSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    caseSteps.userPermissions.map(permissions => Json.toJson(permissions))
+  def permissions(implicit authContext: AuthContext): Traversal.V[Case] => Traversal[JsValue, Vertex, Converter[JsValue, Vertex]] =
+    _.userPermissions.domainMap(permissions => Json.toJson(permissions))
 
-  def caseStatsRenderer(extraData: Set[String])(
-      implicit authContext: AuthContext,
-      db: Database,
-      graph: Graph
-  ): CaseSteps => Traversal[JsObject, JsObject] = {
-    def addData(f: CaseSteps => Traversal[JsValue, JsValue]): GremlinScala[JMap[String, JsValue]] => GremlinScala[JMap[String, JsValue]] =
-      _.by(f(new CaseSteps(__[Vertex])).raw.traversal)
+  def caseStatsRenderer(extraData: Set[String])(implicit
+      authContext: AuthContext
+  ): Traversal.V[Case] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { traversal =>
+    def addData[G](
+        name: String
+    )(f: Traversal.V[Case] => Traversal[JsValue, G, Converter[JsValue, G]]): Traversal[JsObject, JMap[String, Any], Converter[
+      JsObject,
+      JMap[String, Any]
+    ]] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { t =>
+      val dataTraversal = f(traversal.start)
+      t.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.by(dataTraversal.raw)) { jmap =>
+        t.converter(jmap) + (name -> dataTraversal.converter(jmap.get(name).asInstanceOf[G]))
+      }
+    }
 
-    if (extraData.isEmpty) _.constant(JsObject.empty)
+    if (extraData.isEmpty) traversal.constant2[JsObject, JMap[String, Any]](JsObject.empty)
     else {
       val dataName = extraData.toSeq
-      dataName
-        .foldLeft[CaseSteps => GremlinScala[JMap[String, JsValue]]](_.raw.project(dataName.head, dataName.tail: _*)) {
-          case (f, "observableStats") => f.andThen(addData(observableStats))
-          case (f, "taskStats")       => f.andThen(addData(taskStats))
-          case (f, "alerts")          => f.andThen(addData(alertStats))
-          case (f, "isOwner")         => f.andThen(addData(isOwnerStats))
-          case (f, "shareCount")      => f.andThen(addData(shareCountStats))
-          case (f, "permissions")     => f.andThen(addData(permissions))
-          case (f, _)                 => f.andThen(_.by(__.constant(JsNull).traversal))
-        }
-        .andThen(f => Traversal(f.map(m => JsObject(m.asScala))))
+      dataName.foldLeft[Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]]](
+        traversal.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.project(dataName.head, dataName.tail: _*))(_ =>
+          JsObject.empty
+        )
+      ) {
+        case (f, "observableStats") => addData("observableStats")(observableStats)(f)
+        case (f, "taskStats")       => addData("taskStats")(taskStats)(f)
+        case (f, "alerts")          => addData("alerts")(alertStats)(f)
+        case (f, "isOwner")         => addData("isOwner")(isOwnerStats)(f)
+        case (f, "shareCount")      => addData("shareCount")(shareCountStats)(f)
+        case (f, "permissions")     => addData("permissions")(permissions)(f)
+        case (f, _)                 => f
+      }
     }
   }
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseTemplateCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseTemplateCtrl.scala
index 4ca1cef9ea..9e85589031 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/CaseTemplateCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/CaseTemplateCtrl.scala
@@ -4,12 +4,14 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputCaseTemplate
-import org.thp.thehive.models.{Permissions, RichCaseTemplate}
-import org.thp.thehive.services.{CaseTemplateSrv, CaseTemplateSteps, OrganisationSrv}
+import org.thp.thehive.models.{CaseTemplate, Permissions, RichCaseTemplate}
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.{CaseTemplateSrv, OrganisationSrv}
 import play.api.mvc.{Action, AnyContent, Results}
 
 import scala.util.Success
@@ -17,27 +19,28 @@ import scala.util.Success
 @Singleton
 class CaseTemplateCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     caseTemplateSrv: CaseTemplateSrv,
-    organisationSrv: OrganisationSrv
+    organisationSrv: OrganisationSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
 
   override val entityName: String                           = "caseTemplate"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.caseTemplate ::: metaProperties[CaseTemplateSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.caseTemplate
   override val initialQuery: Query =
-    Query.init[CaseTemplateSteps]("listCaseTemplate", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).caseTemplates)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, CaseTemplateSteps](
+    Query
+      .init[Traversal.V[CaseTemplate]]("listCaseTemplate", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).caseTemplates)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[CaseTemplate]](
     "getCaseTemplate",
     FieldsParser[IdOrName],
     (param, graph, authContext) => caseTemplateSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, CaseTemplateSteps, PagedResult[RichCaseTemplate]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[CaseTemplate], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, caseTemplateSteps, _) => caseTemplateSteps.richPage(range.from, range.to, range.extraData.contains("total"))(_.richCaseTemplate)
   )
-  override val outputQuery: Query               = Query.output[RichCaseTemplate, CaseTemplateSteps](_.richCaseTemplate)
+  override val outputQuery: Query               = Query.output[RichCaseTemplate, Traversal.V[CaseTemplate]](_.richCaseTemplate)
   override val extraQueries: Seq[ParamQuery[_]] = Seq()
 
   def create: Action[AnyContent] =
@@ -68,10 +71,10 @@ class CaseTemplateCtrl @Inject() (
     entrypoint("list case template")
       .authRoTransaction(db) { implicit request => implicit graph =>
         val caseTemplates = caseTemplateSrv
-          .initSteps
+          .startTraversal
           .visible
           .richCaseTemplate
-          .toList
+          .toSeq
         Success(Results.Ok(caseTemplates.toJson))
       }
 
diff --git a/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala b/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala
index 4ec7257c4d..1b3c2afa81 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala
@@ -10,13 +10,12 @@ import org.thp.thehive.models._
 import play.api.libs.json.{JsObject, JsValue, Json}
 
 object Conversion {
-
-  implicit class RendererOps[O, D](o: O)(implicit renderer: Renderer.Aux[O, D]) {
-    def toJson: JsValue = renderer.toOutput(o).toJson
-    def toOutput: D     = renderer.toOutput(o).toValue
+  implicit class RendererOps[V, O](v: V)(implicit renderer: Renderer.Aux[V, O]) {
+    def toJson: JsValue = renderer.toOutput(v).toJson
+    def toOutput: O     = renderer.toOutput(v).toValue
   }
 
-  implicit val alertOutput: Renderer.Aux[RichAlert, OutputAlert] = Renderer.json[RichAlert, OutputAlert](
+  implicit val alertOutput: Renderer.Aux[RichAlert, OutputAlert] = Renderer.toJson[RichAlert, OutputAlert](
     _.into[OutputAlert]
       .withFieldConst(_._type, "Alert")
       .withFieldComputed(_.customFields, _.customFields.map(_.toOutput).toSet)
@@ -25,8 +24,8 @@ object Conversion {
       .transform
   )
 
-  implicit val alertWithStatsOutput: Renderer[(RichAlert, JsObject)] =
-    Renderer.json[(RichAlert, JsObject), OutputAlert] { alertWithExtraData =>
+  implicit val alertWithStatsOutput: Renderer.Aux[(RichAlert, JsObject), OutputAlert] =
+    Renderer.toJson[(RichAlert, JsObject), OutputAlert] { alertWithExtraData =>
       alertWithExtraData
         ._1
         .into[OutputAlert]
@@ -37,7 +36,7 @@ object Conversion {
         .transform
     }
 
-  implicit val auditOutput: Renderer.Aux[RichAudit, OutputAudit] = Renderer.json[RichAudit, OutputAudit](
+  implicit val auditOutput: Renderer.Aux[RichAudit, OutputAudit] = Renderer.toJson[RichAudit, OutputAudit](
     _.into[OutputAudit]
       .withFieldComputed(_.operation, _.action)
       .withFieldComputed(_._id, _._id)
@@ -75,7 +74,7 @@ object Conversion {
         .transform
   }
 
-  implicit val caseOutput: Renderer.Aux[RichCase, OutputCase] = Renderer.json[RichCase, OutputCase](
+  implicit val caseOutput: Renderer.Aux[RichCase, OutputCase] = Renderer.toJson[RichCase, OutputCase](
     _.into[OutputCase]
       .withFieldConst(_._type, "Case")
       .withFieldComputed(_.customFields, _.customFields.map(_.toOutput).toSet)
@@ -85,8 +84,8 @@ object Conversion {
       .transform
   )
 
-  implicit val caseWithStatsOutput: Renderer[(RichCase, JsObject)] =
-    Renderer.json[(RichCase, JsObject), OutputCase] { caseWithExtraData =>
+  implicit val caseWithStatsOutput: Renderer.Aux[(RichCase, JsObject), OutputCase] =
+    Renderer.toJson[(RichCase, JsObject), OutputCase] { caseWithExtraData =>
       caseWithExtraData
         ._1
         .into[OutputCase]
@@ -140,7 +139,7 @@ object Conversion {
         .transform
   }
 
-  implicit val caseTemplateOutput: Renderer.Aux[RichCaseTemplate, OutputCaseTemplate] = Renderer.json[RichCaseTemplate, OutputCaseTemplate](
+  implicit val caseTemplateOutput: Renderer.Aux[RichCaseTemplate, OutputCaseTemplate] = Renderer.toJson[RichCaseTemplate, OutputCaseTemplate](
     _.into[OutputCaseTemplate]
       .withFieldConst(_._type, "CaseTemplate")
       .withFieldComputed(_.customFields, _.customFields.map(_.toOutput).toSet)
@@ -149,16 +148,17 @@ object Conversion {
       .transform
   )
 
-  implicit val richCustomFieldOutput: Renderer.Aux[RichCustomField, OutputCustomFieldValue] = Renderer.json[RichCustomField, OutputCustomFieldValue](
-    _.into[OutputCustomFieldValue]
-      .withFieldComputed(_.value, _.jsValue)
-      .withFieldComputed(_.`type`, _.typeName)
-      .withFieldComputed(_.order, _.order.getOrElse(0))
-      .transform
-  )
+  implicit val richCustomFieldOutput: Renderer.Aux[RichCustomField, OutputCustomFieldValue] =
+    Renderer.toJson[RichCustomField, OutputCustomFieldValue](
+      _.into[OutputCustomFieldValue]
+        .withFieldComputed(_.value, _.jsValue)
+        .withFieldComputed(_.`type`, _.typeName)
+        .withFieldComputed(_.order, _.order.getOrElse(0))
+        .transform
+    )
 
   implicit val customFieldOutput: Renderer.Aux[CustomField with Entity, OutputCustomField] =
-    Renderer.json[CustomField with Entity, OutputCustomField](
+    Renderer.toJson[CustomField with Entity, OutputCustomField](
       _.asInstanceOf[CustomField]
         .into[OutputCustomField]
         .withFieldComputed(_.`type`, _.`type`.toString)
@@ -175,7 +175,7 @@ object Conversion {
   }
 
   implicit val richOrganisationRenderer: Renderer.Aux[RichOrganisation, OutputOrganisation] =
-    Renderer.json[RichOrganisation, OutputOrganisation](organisation =>
+    Renderer.toJson[RichOrganisation, OutputOrganisation](organisation =>
       organisation
         .into[OutputOrganisation]
         .withFieldConst(_._type, "Organisation")
@@ -186,7 +186,7 @@ object Conversion {
     )
 
   implicit val organiastionRenderer: Renderer.Aux[Organisation with Entity, OutputOrganisation] =
-    Renderer.json[Organisation with Entity, OutputOrganisation](organisation =>
+    Renderer.toJson[Organisation with Entity, OutputOrganisation](organisation =>
       OutputOrganisation(
         organisation._id,
         "organisation",
@@ -212,7 +212,7 @@ object Conversion {
         .transform
   }
 
-  implicit val taskOutput: Renderer.Aux[RichTask, OutputTask] = Renderer.json[RichTask, OutputTask](
+  implicit val taskOutput: Renderer.Aux[RichTask, OutputTask] = Renderer.toJson[RichTask, OutputTask](
     _.into[OutputTask]
       .withFieldConst(_._type, "Task")
       .withFieldComputed(_.status, _.status.toString)
@@ -221,8 +221,8 @@ object Conversion {
       .transform
   )
 
-  implicit val taskWithStatsOutput: Renderer[(RichTask, JsObject)] =
-    Renderer.json[(RichTask, JsObject), OutputTask] { taskWithExtraData =>
+  implicit val taskWithStatsOutput: Renderer.Aux[(RichTask, JsObject), OutputTask] =
+    Renderer.toJson[(RichTask, JsObject), OutputTask] { taskWithExtraData =>
       taskWithExtraData
         ._1
         .into[OutputTask]
@@ -247,7 +247,7 @@ object Conversion {
         .transform
   }
 
-  implicit val userOutput: Renderer.Aux[RichUser, OutputUser] = Renderer.json[RichUser, OutputUser](
+  implicit val userOutput: Renderer.Aux[RichUser, OutputUser] = Renderer.toJson[RichUser, OutputUser](
     _.into[OutputUser]
       .withFieldComputed(_.permissions, _.permissions.asInstanceOf[Set[String]])
       .withFieldComputed(_.hasKey, _.apikey.isDefined)
@@ -257,7 +257,7 @@ object Conversion {
   )
 
   implicit val userWithOrganisationOutput: Renderer.Aux[(RichUser, Seq[(String, String)]), OutputUser] =
-    Renderer.json[(RichUser, Seq[(String, String)]), OutputUser] { userWithOrganisations =>
+    Renderer.toJson[(RichUser, Seq[(String, String)]), OutputUser] { userWithOrganisations =>
       val (user, organisations) = userWithOrganisations
       user
         .into[OutputUser]
@@ -268,7 +268,7 @@ object Conversion {
         .transform
     }
 
-  implicit val profileOutput: Renderer.Aux[Profile with Entity, OutputProfile] = Renderer.json[Profile with Entity, OutputProfile](profile =>
+  implicit val profileOutput: Renderer.Aux[Profile with Entity, OutputProfile] = Renderer.toJson[Profile with Entity, OutputProfile](profile =>
     profile
       .asInstanceOf[Profile]
       .into[OutputProfile]
@@ -284,7 +284,7 @@ object Conversion {
       .transform
   )
 
-  implicit val dashboardOutput: Renderer.Aux[RichDashboard, OutputDashboard] = Renderer.json[RichDashboard, OutputDashboard](dashboard =>
+  implicit val dashboardOutput: Renderer.Aux[RichDashboard, OutputDashboard] = Renderer.toJson[RichDashboard, OutputDashboard](dashboard =>
     dashboard
       .into[OutputDashboard]
       .withFieldConst(_._id, dashboard._id)
@@ -298,7 +298,7 @@ object Conversion {
       .transform
   )
 
-  implicit val attachmentOutput: Renderer.Aux[Attachment with Entity, OutputAttachment] = Renderer.json[Attachment with Entity, OutputAttachment](
+  implicit val attachmentOutput: Renderer.Aux[Attachment with Entity, OutputAttachment] = Renderer.toJson[Attachment with Entity, OutputAttachment](
     _.asInstanceOf[Attachment]
       .into[OutputAttachment]
       .withFieldComputed(_.hashes, _.hashes.map(_.toString).sortBy(_.length)(Ordering.Int.reverse))
@@ -315,7 +315,7 @@ object Conversion {
         .withFieldComputed(_.tlp, _.tlp.getOrElse(2))
         .transform
   }
-  implicit val observableOutput: Renderer.Aux[RichObservable, OutputObservable] = Renderer.json[RichObservable, OutputObservable](richObservable =>
+  implicit val observableOutput: Renderer.Aux[RichObservable, OutputObservable] = Renderer.toJson[RichObservable, OutputObservable](richObservable =>
     richObservable
       .into[OutputObservable]
       .withFieldConst(_._type, "Observable")
@@ -345,7 +345,7 @@ object Conversion {
   )
 
   implicit val observableWithExtraData: Renderer.Aux[(RichObservable, JsObject), OutputObservable] =
-    Renderer.json[(RichObservable, JsObject), OutputObservable] {
+    Renderer.toJson[(RichObservable, JsObject), OutputObservable] {
       case (richObservable, extraData) =>
         richObservable
           .into[OutputObservable]
@@ -370,7 +370,7 @@ object Conversion {
           .transform
     }
 
-  implicit val logOutput: Renderer.Aux[RichLog, OutputLog] = Renderer.json[RichLog, OutputLog](richLog =>
+  implicit val logOutput: Renderer.Aux[RichLog, OutputLog] = Renderer.toJson[RichLog, OutputLog](richLog =>
     richLog
       .into[OutputLog]
       .withFieldConst(_._type, "Log")
@@ -381,8 +381,8 @@ object Conversion {
       .transform
   )
 
-  implicit val logWithStatsOutput: Renderer[(RichLog, JsObject)] =
-    Renderer.json[(RichLog, JsObject), OutputLog] { logWithExtraData =>
+  implicit val logWithStatsOutput: Renderer.Aux[(RichLog, JsObject), OutputLog] =
+    Renderer.toJson[(RichLog, JsObject), OutputLog] { logWithExtraData =>
       logWithExtraData
         ._1
         .into[OutputLog]
diff --git a/thehive/app/org/thp/thehive/controllers/v1/CustomFieldCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/CustomFieldCtrl.scala
index 055bbf6350..a3295d021c 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/CustomFieldCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/CustomFieldCtrl.scala
@@ -3,7 +3,7 @@ package org.thp.thehive.controllers.v1
 import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
 import org.thp.thehive.services.CustomFieldSrv
@@ -28,9 +28,8 @@ class CustomFieldCtrl @Inject() (entrypoint: Entrypoint, @Named("with-thehive-sc
     entrypoint("list custom fields")
       .authRoTransaction(db) { _ => implicit graph =>
         val customFields = customFieldSrv
-          .initSteps
-          .toList
-
+          .startTraversal
+          .toSeq
         Success(Results.Ok(customFields.toJson))
       }
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/DescribeCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/DescribeCtrl.scala
index abd04627b3..25c45fd70b 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/DescribeCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/DescribeCtrl.scala
@@ -10,7 +10,7 @@ import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.PublicProperty
 import org.thp.scalligraph.services.config.ApplicationConfig.durationFormat
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Hash
 import org.thp.thehive.services.{CustomFieldSrv, ImpactStatusSrv, ResolutionStatusSrv}
 import play.api.Logger
@@ -86,16 +86,16 @@ class DescribeCtrl @Inject() (
   implicit val propertyDescriptionWrites: Writes[PropertyDescription] =
     Json.writes[PropertyDescription].transform((_: JsObject) + ("description" -> JsString("")))
 
-  def customFields: List[PropertyDescription] = db.roTransaction { implicit graph =>
-    customFieldSrv.initSteps.toList.map(cf => PropertyDescription(s"customFields.${cf.name}", cf.`type`.toString))
+  def customFields: Seq[PropertyDescription] = db.roTransaction { implicit graph =>
+    customFieldSrv.startTraversal.toSeq.map(cf => PropertyDescription(s"customFields.${cf.name}", cf.`type`.toString))
   }
 
   def impactStatus: PropertyDescription = db.roTransaction { implicit graph =>
-    PropertyDescription("impactStatus", "enumeration", impactStatusSrv.initSteps.toList.map(s => JsString(s.value)))
+    PropertyDescription("impactStatus", "enumeration", impactStatusSrv.startTraversal.toSeq.map(s => JsString(s.value)))
   }
 
   def resolutionStatus: PropertyDescription = db.roTransaction { implicit graph =>
-    PropertyDescription("resolutionStatus", "enumeration", resolutionStatusSrv.initSteps.toList.map(s => JsString(s.value)))
+    PropertyDescription("resolutionStatus", "enumeration", resolutionStatusSrv.startTraversal.toSeq.map(s => JsString(s.value)))
   }
 
   def customDescription(model: String, propertyName: String): Option[Seq[PropertyDescription]] = (model, propertyName) match {
diff --git a/thehive/app/org/thp/thehive/controllers/v1/LogCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/LogCtrl.scala
index 62f31cef2c..eee92d124b 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/LogCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/LogCtrl.scala
@@ -4,15 +4,19 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputLog
-import org.thp.thehive.models.{Permissions, RichLog}
-import org.thp.thehive.services.{LogSrv, LogSteps, OrganisationSrv, TaskSrv}
+import org.thp.thehive.models.{Log, Permissions, RichLog}
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
+import org.thp.thehive.services.{LogSrv, OrganisationSrv, TaskSrv}
 import play.api.Logger
-import play.api.libs.json.JsObject
 import play.api.mvc.{Action, AnyContent, Results}
+
 @Singleton
 class LogCtrl @Inject() (
     entrypoint: Entrypoint,
@@ -25,23 +29,23 @@ class LogCtrl @Inject() (
     with LogRenderer {
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "log"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.log ::: metaProperties[LogSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.log
   override val initialQuery: Query =
-    Query.init[LogSteps]("listLog", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks.logs)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, LogSteps](
+    Query.init[Traversal.V[Log]]("listLog", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks.logs)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Log]](
     "getLog",
     FieldsParser[IdOrName],
     (param, graph, authContext) => logSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, LogSteps, PagedResult[(RichLog, JsObject)]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Log], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, logSteps, authContext) =>
       logSteps.richPage(range.from, range.to, range.extraData.contains("total"))(
-        _.richLogWithCustomRenderer(logStatsRenderer(range.extraData - "total")(db, logSteps.graph))(authContext)
+        _.richLogWithCustomRenderer(logStatsRenderer(range.extraData - "total"))
       )
   )
-  override val outputQuery: Query = Query.output[RichLog, LogSteps](_.richLog)
+  override val outputQuery: Query = Query.output[RichLog, Traversal.V[Log]](_.richLog)
 
   def create(taskId: String): Action[AnyContent] =
     entrypoint("create log")
@@ -52,7 +56,7 @@ class LogCtrl @Inject() (
           task <- taskSrv
             .getByIds(taskId)
             .can(Permissions.manageTask)
-            .getOrFail()
+            .getOrFail("Task")
           createdLog <- logSrv.create(inputLog.toLog, task)
           attachment <- inputLog.attachment.map(logSrv.addAttachment(createdLog, _)).flip
           richLog = RichLog(createdLog, attachment.toList)
@@ -77,7 +81,7 @@ class LogCtrl @Inject() (
     entrypoint("delete log")
       .authTransaction(db) { implicit req => implicit graph =>
         for {
-          log <- logSrv.get(logId).can(Permissions.manageTask).getOrFail()
+          log <- logSrv.get(logId).can(Permissions.manageTask).getOrFail("Log")
           _   <- logSrv.cascadeRemove(log)
         } yield Results.NoContent
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/LogRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/LogRenderer.scala
index c63ab38427..8fdd2b5cfe 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/LogRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/LogRenderer.scala
@@ -1,44 +1,55 @@
 package org.thp.thehive.controllers.v1
 
-import java.util.{Map => JMap}
+import java.lang.{Long => JLong}
+import java.util.{List => JList, Map => JMap}
 
-import gremlin.scala.{__, Graph, GremlinScala, Vertex}
-import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
+import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
-import org.thp.thehive.services.LogSteps
-import play.api.libs.json.{JsNull, JsNumber, JsObject, JsString, JsValue}
-
-import scala.collection.JavaConverters._
+import org.thp.thehive.models.Log
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.TaskOps._
+import play.api.libs.json._
 
 trait LogRenderer {
 
-  def taskParent(logSteps: LogSteps): Traversal[JsValue, JsValue] =
-    logSteps.task.richTask.fold.map(_.asScala.headOption.fold[JsValue](JsNull)(_.toJson))
-
-  def taskParentId(logSteps: LogSteps): Traversal[JsValue, JsValue] =
-    logSteps.task.fold.map(_.asScala.headOption.fold[JsValue](JsNull)(c => JsString(c.id().toString)))
-
-  def actionCount(logSteps: LogSteps): Traversal[JsValue, JsValue] =
-    Traversal(logSteps.raw.in("ActionContext").count()).map(c => JsNumber(c.longValue()))
-
-  def logStatsRenderer(extraData: Set[String])(implicit db: Database, graph: Graph): LogSteps => Traversal[JsObject, JsObject] = {
-    def addData(f: LogSteps => Traversal[JsValue, JsValue]): GremlinScala[JMap[String, JsValue]] => GremlinScala[JMap[String, JsValue]] =
-      _.by(f(new LogSteps(__[Vertex])).raw.traversal)
-
-    if (extraData.isEmpty) _.constant(JsObject.empty)
-    else {
-      val dataName = extraData.toSeq
-      dataName
-        .foldLeft[LogSteps => GremlinScala[JMap[String, JsValue]]](_.raw.project(dataName.head, dataName.tail: _*)) {
-          case (f, "task")        => f.andThen(addData(taskParent))
-          case (f, "taskId")      => f.andThen(addData(taskParentId))
-          case (f, "actionCount") => f.andThen(addData(actionCount))
-          case (f, _)             => f.andThen(_.by(__.constant(JsNull).traversal))
+  def taskParent: Traversal.V[Log] => Traversal[JsValue, JList[JMap[String, Any]], Converter[JsValue, JList[JMap[String, Any]]]] =
+    _.task.richTask.fold.domainMap(_.headOption.fold[JsValue](JsNull)(_.toJson))
+
+  def taskParentId: Traversal.V[Log] => Traversal[JsValue, JList[Vertex], Converter[JsValue, JList[Vertex]]] =
+    _.task.fold.domainMap(_.headOption.fold[JsValue](JsNull)(c => JsString(c._id)))
+
+  def actionCount: Traversal.V[Log] => Traversal[JsNumber, JLong, Converter[JsNumber, JLong]] =
+    _.in("ActionContext").count.domainMap(JsNumber(_))
+
+  def logStatsRenderer(extraData: Set[String]): Traversal.V[Log] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = {
+    traversal =>
+      def addData[G](
+          name: String
+      )(f: Traversal.V[Log] => Traversal[JsValue, G, Converter[JsValue, G]]): Traversal[JsObject, JMap[String, Any], Converter[
+        JsObject,
+        JMap[String, Any]
+      ]] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { t =>
+        val dataTraversal = f(traversal.start)
+        t.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.by(dataTraversal.raw)) { jmap =>
+          t.converter(jmap) + (name -> dataTraversal.converter(jmap.get(name).asInstanceOf[G]))
+        }
+      }
+
+      if (extraData.isEmpty) traversal.constant2[JsObject, JMap[String, Any]](JsObject.empty)
+      else {
+        val dataName = extraData.toSeq
+        dataName.foldLeft[Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]]](
+          traversal.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.project(dataName.head, dataName.tail: _*))(_ =>
+            JsObject.empty
+          )
+        ) {
+          case (f, "task")        => addData("task")(taskParent)(f)
+          case (f, "taskId")      => addData("taskId")(taskParentId)(f)
+          case (f, "actionCount") => addData("actionCount")(actionCount)(f)
+          case (f, _)             => f
         }
-        .andThen(f => Traversal(f.map(m => JsObject(m.asScala))))
-    }
+      }
   }
-
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
index 301a2c7087..c224d99ec5 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
@@ -5,15 +5,18 @@ import org.thp.scalligraph._
 import org.thp.scalligraph.controllers._
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
+import org.thp.thehive.controllers.v1.Conversion._
+import org.thp.thehive.dto.v1.InputObservable
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
 import org.thp.thehive.services._
 import play.api.Logger
-import play.api.libs.json.JsObject
 import play.api.mvc.{Action, AnyContent, Results}
-import org.thp.thehive.controllers.v1.Conversion._
-import org.thp.thehive.dto.v1.InputObservable
 
 @Singleton
 class ObservableCtrl @Inject() (
@@ -29,29 +32,38 @@ class ObservableCtrl @Inject() (
 
   lazy val logger: Logger                                   = Logger(getClass)
   override val entityName: String                           = "observable"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.observable ::: metaProperties[ObservableSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.observable
   override val initialQuery: Query =
-    Query.init[ObservableSteps]("listObservable", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.observables)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, ObservableSteps](
+    Query.init[Traversal.V[Observable]](
+      "listObservable",
+      (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.observables
+    )
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Observable]](
     "getObservable",
     FieldsParser[IdOrName],
     (param, graph, authContext) => observableSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, ObservableSteps, PagedResult[(RichObservable, JsObject)]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Observable], IteratorOutput](
     "page",
     FieldsParser[OutputParam], {
       case (OutputParam(from, to, extraData), observableSteps, authContext) =>
         observableSteps.richPage(from, to, extraData.contains("total")) {
-          _.richObservableWithCustomRenderer(observableStatsRenderer(extraData - "total")(authContext, db, observableSteps.graph))
+          _.richObservableWithCustomRenderer(observableStatsRenderer(extraData - "total")(authContext))(authContext)
         }
     }
   )
-  override val outputQuery: Query = Query.output[RichObservable, ObservableSteps](_.richObservable)
+  override val outputQuery: Query = Query.output[RichObservable, Traversal.V[Observable]](_.richObservable)
 
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[ObservableSteps, OrganisationSteps]("organisations", (observableSteps, authContext) => observableSteps.organisations.visible(authContext)),
-    Query[ObservableSteps, ObservableSteps]("similar", (observableSteps, authContext) => observableSteps.similar.visible(authContext)),
-    Query[ObservableSteps, CaseSteps]("case", (observableSteps, _) => observableSteps.`case`)
+    Query[Traversal.V[Observable], Traversal.V[Organisation]](
+      "organisations",
+      (observableSteps, authContext) => observableSteps.organisations.visible(authContext)
+    ),
+    Query[Traversal.V[Observable], Traversal.V[Observable]](
+      "similar",
+      (observableSteps, authContext) => observableSteps.similar.visible(authContext)
+    ),
+    Query[Traversal.V[Observable], Traversal.V[Case]]("case", (observableSteps, _) => observableSteps.`case`)
   )
 
   def create(caseId: String): Action[AnyContent] =
diff --git a/thehive/app/org/thp/thehive/controllers/v1/ObservableRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/ObservableRenderer.scala
index fc39979be1..ae88526ba2 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/ObservableRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/ObservableRenderer.scala
@@ -1,77 +1,88 @@
 package org.thp.thehive.controllers.v1
 
-import java.util.{Map => JMap}
+import java.lang.{Boolean => JBoolean, Long => JLong}
+import java.util.{List => JList, Map => JMap}
 
-import gremlin.scala.{__, By, Graph, GremlinScala, Key, Vertex}
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
-import org.thp.thehive.services.ObservableSteps
+import org.thp.thehive.models.Observable
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
 import play.api.libs.json._
 
-import scala.collection.JavaConverters._
-
 trait ObservableRenderer {
 
-  def seen(observableSteps: ObservableSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    observableSteps
-      .similar
+  def seenStats(implicit
+      authContext: AuthContext
+  ): Traversal.V[Observable] => Traversal[JsObject, JMap[JBoolean, JLong], Converter[JsObject, JMap[JBoolean, JLong]]] =
+    _.similar
       .visible
-      .groupCount(By(Key[Boolean]("ioc")))
-      .map { stats =>
-        val m      = stats.asScala
-        val nTrue  = m.get(true).fold(0L)(_.toLong)
-        val nFalse = m.get(false).fold(0L)(_.toLong)
+      .groupCount(_.byValue(_.ioc))
+      .domainMap { stats =>
+        val nTrue  = stats.getOrElse(true, 0L)
+        val nFalse = stats.getOrElse(false, 0L)
         Json.obj(
           "seen" -> (nTrue + nFalse),
           "ioc"  -> (nTrue > 0)
         )
       }
 
-  def shares(observableSteps: ObservableSteps): Traversal[JsValue, JsValue] =
-    observableSteps.shares.organisation.name.fold.map(orgs => Json.toJson(orgs.asScala))
+  def sharesStats: Traversal.V[Observable] => Traversal[JsValue, JList[String], Converter[JsValue, JList[String]]] =
+    _.organisations.value(_.name).fold.domainMap(Json.toJson(_))
 
-  def shareCount(observableSteps: ObservableSteps): Traversal[JsValue, JsValue] =
-    observableSteps.organisations.count.map(c => JsNumber(c - 1))
+  def shareCount: Traversal.V[Observable] => Traversal[JsValue, JLong, Converter[JsValue, JLong]] =
+    _.organisations.count.domainMap(count => JsNumber(count.longValue() - 1))
 
-  def isOwner(
-      observableSteps: ObservableSteps
-  )(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    observableSteps.origin.has("name", authContext.organisation).fold.map(l => JsBoolean(!l.isEmpty))
+  def isOwner(implicit
+      authContext: AuthContext
+  ): Traversal.V[Observable] => Traversal[JsBoolean, JList[Vertex], Converter[JsBoolean, JList[Vertex]]] =
+    _.origin.has("name", authContext.organisation).fold.domainMap(l => JsBoolean(l.nonEmpty))
 
-  def observableLinks(observableSteps: ObservableSteps): Traversal[JsValue, JsValue] =
-    observableSteps.coalesce(
-      _.alert.richAlert.map(a => Json.obj("alert"            -> a.toJson)),
-      _.`case`.richCaseWithoutPerms.map(c => Json.obj("case" -> c.toJson))
+  def observableLinks: Traversal.V[Observable] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+    _.coalesce(
+      _.alert.richAlert.domainMap(a => Json.obj("alert" -> a.toJson)),
+      _.`case`.richCaseWithoutPerms.domainMap(c => Json.obj("case" -> c.toJson))
     )
 
-  def permissions(observableSteps: ObservableSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    observableSteps.userPermissions.map(permissions => Json.toJson(permissions))
+  def permissions(implicit authContext: AuthContext): Traversal.V[Observable] => Traversal[JsValue, Vertex, Converter[JsValue, Vertex]] =
+    _.userPermissions.domainMap(permissions => Json.toJson(permissions))
 
-  def observableStatsRenderer(extraData: Set[String])(
-      implicit authContext: AuthContext,
-      db: Database,
-      graph: Graph
-  ): ObservableSteps => Traversal[JsObject, JsObject] = {
-    def addData(f: ObservableSteps => Traversal[JsValue, JsValue]): GremlinScala[JMap[String, JsValue]] => GremlinScala[JMap[String, JsValue]] =
-      _.by(f(new ObservableSteps(__[Vertex])).raw.traversal)
+  def observableStatsRenderer(
+      extraData: Set[String]
+  )(implicit authContext: AuthContext): Traversal.V[Observable] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = {
+    traversal =>
+      def addData[G](
+          name: String
+      )(f: Traversal.V[Observable] => Traversal[JsValue, G, Converter[JsValue, G]]): Traversal[JsObject, JMap[String, Any], Converter[
+        JsObject,
+        JMap[String, Any]
+      ]] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { t =>
+        val dataTraversal = f(traversal.start)
+        t.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.by(dataTraversal.raw)) { jmap =>
+          t.converter(jmap) + (name -> dataTraversal.converter(jmap.get(name).asInstanceOf[G]))
+        }
+      }
 
-    if (extraData.isEmpty) _.constant(JsObject.empty)
-    else {
-      val dataName = extraData.toSeq
-      dataName
-        .foldLeft[ObservableSteps => GremlinScala[JMap[String, JsValue]]](_.raw.project(dataName.head, dataName.tail: _*)) {
-          case (f, "seen")        => f.andThen(addData(seen))
-          case (f, "shares")      => f.andThen(addData(shares))
-          case (f, "isOwner")     => f.andThen(addData(isOwner))
-          case (f, "shareCount")  => f.andThen(addData(shareCount))
-          case (f, "links")       => f.andThen(addData(observableLinks))
-          case (f, "permissions") => f.andThen(addData(permissions))
-          case (f, _)             => f.andThen(_.by(__.constant(JsNull).traversal))
+      if (extraData.isEmpty) traversal.constant2[JsObject, JMap[String, Any]](JsObject.empty)
+      else {
+        val dataName = extraData.toSeq
+        dataName.foldLeft[Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]]](
+          traversal.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.project(dataName.head, dataName.tail: _*))(_ =>
+            JsObject.empty
+          )
+        ) {
+          case (f, "seen")        => addData("seen")(seenStats)(f)
+          case (f, "shares")      => addData("shares")(sharesStats)(f)
+          case (f, "links")       => addData("links")(observableLinks)(f)
+          case (f, "permissions") => addData("permissions")(permissions)(f)
+          case (f, "isOwner")     => addData("isOwner")(isOwner)(f)
+          case (f, "shareCount")  => addData("shareCount")(shareCount)(f)
+          case (f, _)             => f
         }
-        .andThen(f => Traversal(f.map(m => JsObject(m.asScala))))
-    }
+      }
   }
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/OrganisationCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/OrganisationCtrl.scala
index e4a3cc2c0e..a227c96998 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/OrganisationCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/OrganisationCtrl.scala
@@ -4,43 +4,45 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputOrganisation
-import org.thp.thehive.models.{Permissions, RichOrganisation}
+import org.thp.thehive.models._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.mvc.{Action, AnyContent, Results}
 
 @Singleton
 class OrganisationCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     organisationSrv: OrganisationSrv,
-    userSrv: UserSrv
+    userSrv: UserSrv,
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
 
   override val entityName: String                           = "organisation"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.organisation ::: metaProperties[OrganisationSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.organisation
   override val initialQuery: Query =
-    Query.init[OrganisationSteps]("listOrganisation", (graph, authContext) => organisationSrv.initSteps(graph).visible(authContext))
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, OrganisationSteps, PagedResult[RichOrganisation]](
+    Query.init[Traversal.V[Organisation]]("listOrganisation", (graph, authContext) => organisationSrv.startTraversal(graph).visible(authContext))
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Organisation], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, organisationSteps, _) => organisationSteps.richPage(range.from, range.to, range.extraData.contains("total"))(_.richOrganisation)
   )
-  override val outputQuery: Query = Query.output[RichOrganisation, OrganisationSteps](_.richOrganisation)
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, OrganisationSteps](
+  override val outputQuery: Query = Query.output[RichOrganisation, Traversal.V[Organisation]](_.richOrganisation)
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Organisation]](
     "getOrganisation",
     FieldsParser[IdOrName],
     (param, graph, authContext) => organisationSrv.get(param.idOrName)(graph).visible(authContext)
   )
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query[OrganisationSteps, OrganisationSteps]("visible", (organisationSteps, _) => organisationSteps.visibleOrganisationsFrom),
-    Query[OrganisationSteps, UserSteps]("users", (organisationSteps, _) => organisationSteps.users),
-    Query[OrganisationSteps, CaseTemplateSteps]("caseTemplates", (organisationSteps, _) => organisationSteps.caseTemplates),
-    Query[OrganisationSteps, AlertSteps]("alerts", (organisationSteps, _) => organisationSteps.alerts)
+    Query[Traversal.V[Organisation], Traversal.V[Organisation]]("visible", (organisationSteps, _) => organisationSteps.visibleOrganisationsFrom),
+    Query[Traversal.V[Organisation], Traversal.V[User]]("users", (organisationSteps, _) => organisationSteps.users),
+    Query[Traversal.V[Organisation], Traversal.V[CaseTemplate]]("caseTemplates", (organisationSteps, _) => organisationSteps.caseTemplates),
+    Query[Traversal.V[Organisation], Traversal.V[Alert]]("alerts", (organisationSteps, _) => organisationSteps.alerts)
   )
 
   def create: Action[AnyContent] =
@@ -49,7 +51,7 @@ class OrganisationCtrl @Inject() (
       .authPermittedTransaction(db, Permissions.manageOrganisation) { implicit request => implicit graph =>
         val inputOrganisation: InputOrganisation = request.body("organisation")
         for {
-          user         <- userSrv.current.getOrFail()
+          user         <- userSrv.current.getOrFail("User")
           organisation <- organisationSrv.create(inputOrganisation.toOrganisation, user)
         } yield Results.Created(organisation.toJson)
       }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/ProfileCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/ProfileCtrl.scala
index 1f80e19f5a..f169854c83 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/ProfileCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/ProfileCtrl.scala
@@ -5,32 +5,37 @@ import org.thp.scalligraph.AuthorizationError
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputProfile
 import org.thp.thehive.models.{Permissions, Profile}
-import org.thp.thehive.services.{ProfileSrv, ProfileSteps}
+import org.thp.thehive.services.ProfileOps._
+import org.thp.thehive.services.ProfileSrv
 import play.api.mvc.{Action, AnyContent, Results}
 
 import scala.util.Failure
 
 @Singleton
-class ProfileCtrl @Inject() (entrypoint: Entrypoint, @Named("with-thehive-schema") db: Database, properties: Properties, profileSrv: ProfileSrv)
-    extends QueryableCtrl {
+class ProfileCtrl @Inject() (
+    entrypoint: Entrypoint,
+    properties: Properties,
+    profileSrv: ProfileSrv,
+    @Named("with-thehive-schema") implicit val db: Database
+) extends QueryableCtrl {
 
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, ProfileSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Profile]](
     "getProfile",
     FieldsParser[IdOrName],
     (param, graph, _) => profileSrv.get(param.idOrName)(graph)
   )
   val entityName: String                           = "profile"
-  val publicProperties: List[PublicProperty[_, _]] = properties.profile ::: metaProperties[ProfileSteps]
+  val publicProperties: List[PublicProperty[_, _]] = properties.profile
 
   val initialQuery: Query =
-    Query.init[ProfileSteps]("listProfile", (graph, _) => profileSrv.initSteps(graph))
+    Query.init[Traversal.V[Profile]]("listProfile", (graph, _) => profileSrv.startTraversal(graph))
 
-  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, ProfileSteps, PagedResult[Profile with Entity]](
+  val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Profile], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, profileSteps, _) => profileSteps.page(range.from, range.to, range.extraData.contains("total"))
diff --git a/thehive/app/org/thp/thehive/controllers/v1/Properties.scala b/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
index d631fc19d8..515106b843 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
@@ -3,32 +3,22 @@ package org.thp.thehive.controllers.v1
 import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.BadRequestError
 import org.thp.scalligraph.controllers.FPathElem
-import org.thp.scalligraph.models.UniMapping
-import org.thp.scalligraph.query.{NoValue, PublicProperty, PublicPropertyListBuilder}
-import org.thp.scalligraph.steps.IdMapping
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.thehive.models.CaseStatus
-import org.thp.thehive.services.{
-  AlertSrv,
-  AlertSteps,
-  AuditSteps,
-  CaseSrv,
-  CaseSteps,
-  CaseTemplateSrv,
-  CaseTemplateSteps,
-  LogSteps,
-  ObservableSrv,
-  ObservableSteps,
-  OrganisationSteps,
-  ProfileSteps,
-  TaskSrv,
-  TaskSteps,
-  UserSrv,
-  UserSteps
-}
-import play.api.libs.json.{JsNull, JsObject, JsValue, Json}
+import org.thp.scalligraph.models.{IdMapping, UMapping}
+import org.thp.scalligraph.query.{PublicProperty, PublicPropertyListBuilder}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.AuditOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.TagOps._
+import org.thp.thehive.services.TaskOps._
+import org.thp.thehive.services.UserOps._
+import org.thp.thehive.services._
+import play.api.libs.json.{JsObject, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.Failure
 
 @Singleton
@@ -42,16 +32,16 @@ class Properties @Inject() (
 ) {
 
   lazy val alert: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[AlertSteps]
-      .property("type", UniMapping.string)(_.field.updatable)
-      .property("source", UniMapping.string)(_.field.updatable)
-      .property("sourceRef", UniMapping.string)(_.field.updatable)
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
-      .property("severity", UniMapping.int)(_.field.updatable)
-      .property("date", UniMapping.date)(_.field.updatable)
-      .property("lastSyncDate", UniMapping.date.optional)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[Alert]
+      .property("type", UMapping.string)(_.field.updatable)
+      .property("source", UMapping.string)(_.field.updatable)
+      .property("sourceRef", UMapping.string)(_.field.updatable)
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string)(_.field.updatable)
+      .property("severity", UMapping.int)(_.field.updatable)
+      .property("date", UMapping.date)(_.field.updatable)
+      .property("lastSyncDate", UMapping.date.optional)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             alertSrv
@@ -61,18 +51,18 @@ class Properties @Inject() (
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("tlp", UniMapping.int)(_.field.updatable)
-      .property("pap", UniMapping.int)(_.field.updatable)
-      .property("read", UniMapping.boolean)(_.field.updatable)
-      .property("follow", UniMapping.boolean)(_.field.updatable)
-      .property("read", UniMapping.boolean)(_.field.updatable)
-      .property("imported", UniMapping.boolean)(_.select(_.imported).readonly)
-      .property("summary", UniMapping.string.optional)(_.field.updatable)
-      .property("user", UniMapping.string)(_.field.updatable)
-      .property("customFields", UniMapping.identity[JsValue])(_.subSelect {
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("tlp", UMapping.int)(_.field.updatable)
+      .property("pap", UMapping.int)(_.field.updatable)
+      .property("read", UMapping.boolean)(_.field.updatable)
+      .property("follow", UMapping.boolean)(_.field.updatable)
+      .property("read", UMapping.boolean)(_.field.updatable)
+      .property("imported", UMapping.boolean)(_.select(_.imported).readonly)
+      .property("summary", UMapping.string.optional)(_.field.updatable)
+      .property("user", UMapping.string)(_.field.updatable)
+      .property("customFields", UMapping.jsonNative)(_.subSelect {
         case (FPathElem(_, FPathElem(name, _)), alertSteps) => alertSteps.customFields(name).jsonValue
-        case (_, alertSteps)                                => alertSteps.customFields.nameJsonValue.fold.map(l => JsObject(l.asScala))
+        case (_, alertSteps)                                => alertSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
       }.custom {
         case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
           for {
@@ -80,29 +70,29 @@ class Properties @Inject() (
             _ <- alertSrv.setOrCreateCustomField(c, name, Some(value))(graph, authContext)
           } yield Json.obj(s"customField.$name" -> value)
         case _ => Failure(BadRequestError("Invalid custom fields format"))
-      })(NoValue(JsNull))
+      })
       .build
 
   lazy val audit: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[AuditSteps]
-      .property("operation", UniMapping.string)(_.rename("action").readonly)
-      .property("details", UniMapping.string)(_.field.readonly)
-      .property("objectType", UniMapping.string.optional)(_.field.readonly)
-      .property("objectId", UniMapping.string.optional)(_.field.readonly)
-      .property("base", UniMapping.boolean)(_.rename("mainAction").readonly)
-      .property("startDate", UniMapping.date)(_.rename("_createdAt").readonly)
-      .property("requestId", UniMapping.string)(_.field.readonly)
+    PublicPropertyListBuilder[Audit]
+      .property("operation", UMapping.string)(_.rename("action").readonly)
+      .property("details", UMapping.string)(_.field.readonly)
+      .property("objectType", UMapping.string.optional)(_.field.readonly)
+      .property("objectId", UMapping.string.optional)(_.field.readonly)
+      .property("base", UMapping.boolean)(_.rename("mainAction").readonly)
+      .property("startDate", UMapping.date)(_.rename("_createdAt").readonly)
+      .property("requestId", UMapping.string)(_.field.readonly)
       .property("rootId", IdMapping)(_.select(_.context._id).readonly)
       .build
 
   lazy val `case`: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[CaseSteps]
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
-      .property("severity", UniMapping.int)(_.field.updatable)
-      .property("startDate", UniMapping.date)(_.field.updatable)
-      .property("endDate", UniMapping.date.optional)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[Case]
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string)(_.field.updatable)
+      .property("severity", UMapping.int)(_.field.updatable)
+      .property("startDate", UMapping.date)(_.field.updatable)
+      .property("endDate", UMapping.date.optional)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             caseSrv
@@ -112,12 +102,12 @@ class Properties @Inject() (
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("tlp", UniMapping.int)(_.field.updatable)
-      .property("pap", UniMapping.int)(_.field.updatable)
-      .property("status", UniMapping.enum(CaseStatus))(_.field.updatable)
-      .property("summary", UniMapping.string.optional)(_.field.updatable)
-      .property("assignee", UniMapping.string.optional)(_.select(_.user.login).custom { (_, login, vertex, _, graph, authContext) =>
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("tlp", UMapping.int)(_.field.updatable)
+      .property("pap", UMapping.int)(_.field.updatable)
+      .property("status", UMapping.enum[CaseStatus.type])(_.field.updatable)
+      .property("summary", UMapping.string.optional)(_.field.updatable)
+      .property("assignee", UMapping.string.optional)(_.select(_.user.value(_.login)).custom { (_, login, vertex, _, graph, authContext) =>
         for {
           c    <- caseSrv.get(vertex)(graph).getOrFail("Case")
           user <- login.map(userSrv.get(_)(graph).getOrFail("User")).flip
@@ -127,16 +117,17 @@ class Properties @Inject() (
           }
         } yield Json.obj("owner" -> user.map(_.login))
       })
-      .property("impactStatus", UniMapping.string.optional)(_.select(_.impactStatus.value).custom { (_, value, vertex, _, graph, authContext) =>
-        caseSrv
-          .get(vertex)(graph)
-          .getOrFail("Case")
-          .flatMap { c =>
-            value.fold(caseSrv.unsetImpactStatus(c)(graph, authContext))(caseSrv.setImpactStatus(c, _)(graph, authContext))
-          }
-          .map(_ => Json.obj("impactStatus" -> value))
+      .property("impactStatus", UMapping.string.optional)(_.select(_.impactStatus.value(_.value)).custom {
+        (_, value, vertex, _, graph, authContext) =>
+          caseSrv
+            .get(vertex)(graph)
+            .getOrFail("Case")
+            .flatMap { c =>
+              value.fold(caseSrv.unsetImpactStatus(c)(graph, authContext))(caseSrv.setImpactStatus(c, _)(graph, authContext))
+            }
+            .map(_ => Json.obj("impactStatus" -> value))
       })
-      .property("resolutionStatus", UniMapping.string.optional)(_.select(_.resolutionStatus.value).custom {
+      .property("resolutionStatus", UMapping.string.optional)(_.select(_.resolutionStatus.value(_.value)).custom {
         (_, value, vertex, _, graph, authContext) =>
           caseSrv
             .get(vertex)(graph)
@@ -149,13 +140,13 @@ class Properties @Inject() (
       .build
 
   lazy val caseTemplate: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[CaseTemplateSteps]
-      .property("name", UniMapping.string)(_.field.updatable)
-      .property("displayName", UniMapping.string)(_.field.updatable)
-      .property("titlePrefix", UniMapping.string.optional)(_.field.updatable)
-      .property("description", UniMapping.string.optional)(_.field.updatable)
-      .property("severity", UniMapping.int.optional)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[CaseTemplate]
+      .property("name", UMapping.string)(_.field.updatable)
+      .property("displayName", UMapping.string)(_.field.updatable)
+      .property("titlePrefix", UMapping.string.optional)(_.field.updatable)
+      .property("description", UMapping.string.optional)(_.field.updatable)
+      .property("severity", UMapping.int.optional)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             caseTemplateSrv
@@ -165,14 +156,14 @@ class Properties @Inject() (
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("tlp", UniMapping.int.optional)(_.field.updatable)
-      .property("pap", UniMapping.int.optional)(_.field.updatable)
-      .property("summary", UniMapping.string.optional)(_.field.updatable)
-      .property("user", UniMapping.string)(_.field.updatable)
-      .property("customFields", UniMapping.identity[JsValue])(_.subSelect {
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("tlp", UMapping.int.optional)(_.field.updatable)
+      .property("pap", UMapping.int.optional)(_.field.updatable)
+      .property("summary", UMapping.string.optional)(_.field.updatable)
+      .property("user", UMapping.string)(_.field.updatable)
+      .property("customFields", UMapping.jsonNative)(_.subSelect {
         case (FPathElem(_, FPathElem(name, _)), alertSteps) => alertSteps.customFields(name).jsonValue
-        case (_, alertSteps)                                => alertSteps.customFields.nameJsonValue.fold.map(l => JsObject(l.asScala))
+        case (_, alertSteps)                                => alertSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
       }.custom {
         case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
           for {
@@ -180,32 +171,32 @@ class Properties @Inject() (
             _ <- caseTemplateSrv.setOrCreateCustomField(c, name, Some(value), None)(graph, authContext)
           } yield Json.obj(s"customField.$name" -> value)
         case _ => Failure(BadRequestError("Invalid custom fields format"))
-      })(NoValue(JsNull))
+      })
       .build
 
   lazy val organisation: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[OrganisationSteps]
-      .property("name", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string)(_.field.updatable)
+    PublicPropertyListBuilder[Organisation]
+      .property("name", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string)(_.field.updatable)
       .build
 
   lazy val profile: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[ProfileSteps]
-      .property("name", UniMapping.string)(_.field.updatable)
-      .property("permissions", UniMapping.string.set)(_.field.updatable)
+    PublicPropertyListBuilder[Profile]
+      .property("name", UMapping.string)(_.field.updatable)
+      .property("permissions", UMapping.string.set)(_.field.updatable)
       .build
 
   lazy val task: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[TaskSteps]
-      .property("title", UniMapping.string)(_.field.updatable)
-      .property("description", UniMapping.string.optional)(_.field.updatable)
-      .property("status", UniMapping.string)(_.field.updatable)
-      .property("flag", UniMapping.boolean)(_.field.updatable)
-      .property("startDate", UniMapping.date.optional)(_.field.updatable)
-      .property("endDate", UniMapping.date.optional)(_.field.updatable)
-      .property("order", UniMapping.int)(_.field.updatable)
-      .property("dueDate", UniMapping.date.optional)(_.field.updatable)
-      .property("assignee", UniMapping.string.optional)(_.select(_.assignee.login).custom {
+    PublicPropertyListBuilder[Task]
+      .property("title", UMapping.string)(_.field.updatable)
+      .property("description", UMapping.string.optional)(_.field.updatable)
+      .property("status", UMapping.string)(_.field.updatable)
+      .property("flag", UMapping.boolean)(_.field.updatable)
+      .property("startDate", UMapping.date.optional)(_.field.updatable)
+      .property("endDate", UMapping.date.optional)(_.field.updatable)
+      .property("order", UMapping.int)(_.field.updatable)
+      .property("dueDate", UMapping.date.optional)(_.field.updatable)
+      .property("assignee", UMapping.string.optional)(_.select(_.assignee.value(_.login)).custom {
         case (_, value, vertex, _, graph, authContext) =>
           taskSrv
             .get(vertex)(graph)
@@ -223,28 +214,28 @@ class Properties @Inject() (
       .build
 
   lazy val log: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[LogSteps]
-      .property("message", UniMapping.string)(_.field.updatable)
-      .property("deleted", UniMapping.boolean)(_.field.updatable)
-      .property("date", UniMapping.date)(_.field.readonly)
+    PublicPropertyListBuilder[Log]
+      .property("message", UMapping.string)(_.field.updatable)
+      .property("deleted", UMapping.boolean)(_.field.updatable)
+      .property("date", UMapping.date)(_.field.readonly)
       .property("attachment", IdMapping)(_.select(_.attachments._id).readonly)
       .build
 
   lazy val user: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[UserSteps]
-      .property("login", UniMapping.string)(_.field.readonly)
-      .property("name", UniMapping.string)(_.field.readonly)
-      .property("locked", UniMapping.boolean)(_.field.readonly)
-      .property("avatar", UniMapping.string.optional)(_.select(_.avatar.attachmentId.map(id => s"/api/datastore/$id")).readonly)
+    PublicPropertyListBuilder[User]
+      .property("login", UMapping.string)(_.field.readonly)
+      .property("name", UMapping.string)(_.field.readonly)
+      .property("locked", UMapping.boolean)(_.field.readonly)
+      .property("avatar", UMapping.string.optional)(_.select(_.avatar.value(_.attachmentId).domainMap(id => s"/api/datastore/$id")).readonly)
       .build
 
   lazy val observable: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[ObservableSteps]
-      .property("status", UniMapping.string)(_.select(_.constant("Ok")).readonly)
-      .property("startDate", UniMapping.date)(_.select(_._createdAt).readonly)
-      .property("ioc", UniMapping.boolean)(_.field.updatable)
-      .property("sighted", UniMapping.boolean)(_.field.updatable)
-      .property("tags", UniMapping.string.set)(
+    PublicPropertyListBuilder[Observable]
+      .property("status", UMapping.string)(_.select(_.constant("Ok")).readonly)
+      .property("startDate", UMapping.date)(_.select(_._createdAt).readonly)
+      .property("ioc", UMapping.boolean)(_.field.updatable)
+      .property("sighted", UMapping.boolean)(_.field.updatable)
+      .property("tags", UMapping.string.set)(
         _.select(_.tags.displayName)
           .custom { (_, value, vertex, _, graph, authContext) =>
             observableSrv
@@ -253,10 +244,10 @@ class Properties @Inject() (
               .map(_ => Json.obj("tags" -> value))
           }
       )
-      .property("message", UniMapping.string)(_.field.updatable)
-      .property("tlp", UniMapping.int)(_.field.updatable)
-      .property("dataType", UniMapping.string)(_.select(_.observableType.name).readonly)
-      .property("data", UniMapping.string.optional)(_.select(_.data.data).readonly)
+      .property("message", UMapping.string)(_.field.updatable)
+      .property("tlp", UMapping.int)(_.field.updatable)
+      .property("dataType", UMapping.string)(_.select(_.observableType.value(_.name)).readonly)
+      .property("data", UMapping.string.optional)(_.select(_.data.value(_.data)).readonly)
       // TODO add attachment ?
       .build
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/QueryCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/QueryCtrl.scala
index cfaeac2f26..fa00086918 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/QueryCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/QueryCtrl.scala
@@ -1,10 +1,6 @@
 package org.thp.thehive.controllers.v1
 
-import org.thp.scalligraph.models.UniMapping
-import org.thp.scalligraph.query.{ParamQuery, PublicProperty, PublicPropertyListBuilder, Query}
-import org.thp.scalligraph.steps.BaseVertexSteps
-
-import scala.reflect.runtime.{universe => ru}
+import org.thp.scalligraph.query.{ParamQuery, PublicProperty, Query}
 
 case class IdOrName(idOrName: String)
 
@@ -16,12 +12,4 @@ trait QueryableCtrl {
   val outputQuery: Query
   val getQuery: ParamQuery[IdOrName]
   val extraQueries: Seq[ParamQuery[_]] = Nil
-
-  def metaProperties[S <: BaseVertexSteps: ru.TypeTag]: List[PublicProperty[_, _]] =
-    PublicPropertyListBuilder[S]
-      .property("_createdBy", UniMapping.string)(_.field.readonly)
-      .property("_createdAt", UniMapping.date)(_.field.readonly)
-      .property("_updatedBy", UniMapping.string)(_.field.readonly)
-      .property("_updatedAt", UniMapping.date)(_.field.readonly)
-      .build
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
index 4c34e1070f..1ebed30d9b 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
@@ -4,13 +4,15 @@ import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PropertyUpdater, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputTask
-import org.thp.thehive.models.{Permissions, RichTask, TaskStatus}
-import org.thp.thehive.services.{CaseSrv, CaseSteps, LogSteps, OrganisationSrv, OrganisationSteps, ShareSrv, TaskSrv, TaskSteps, UserSteps}
-import play.api.libs.json.JsObject
+import org.thp.thehive.models._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
+import org.thp.thehive.services.{CaseSrv, OrganisationSrv, ShareSrv, TaskSrv}
 import play.api.mvc.{Action, AnyContent, Results}
 
 import scala.util.Success
@@ -28,32 +30,32 @@ class TaskCtrl @Inject() (
     with TaskRenderer {
 
   override val entityName: String                           = "task"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.task ::: metaProperties[TaskSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.task
   override val initialQuery: Query =
-    Query.init[TaskSteps]("listTask", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks)
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, TaskSteps, PagedResult[(RichTask, JsObject)]](
+    Query.init[Traversal.V[Task]]("listTask", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.tasks)
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[Task], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, taskSteps, authContext) =>
       taskSteps.richPage(range.from, range.to, range.extraData.contains("total"))(
-        _.richTaskWithCustomRenderer(taskStatsRenderer(range.extraData)(authContext, db, taskSteps.graph))
+        _.richTaskWithCustomRenderer(taskStatsRenderer(range.extraData)(authContext))
       )
   )
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, TaskSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[Task]](
     "getTask",
     FieldsParser[IdOrName],
     (param, graph, authContext) => taskSrv.get(param.idOrName)(graph).visible(authContext)
   )
-  override val outputQuery: Query = Query.output[RichTask, TaskSteps](_.richTask)
+  override val outputQuery: Query = Query.output[RichTask, Traversal.V[Task]](_.richTask)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query.init[TaskSteps](
+    Query.init[Traversal.V[Task]](
       "waitingTask",
-      (graph, authContext) => taskSrv.initSteps(graph).has("status", TaskStatus.Waiting).visible(authContext)
+      (graph, authContext) => taskSrv.startTraversal(graph).has("status", TaskStatus.Waiting).visible(authContext)
     ),
-    Query[TaskSteps, UserSteps]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext)),
-    Query[TaskSteps, LogSteps]("logs", (taskSteps, _) => taskSteps.logs),
-    Query[TaskSteps, CaseSteps]("case", (taskSteps, _) => taskSteps.`case`),
-    Query[TaskSteps, OrganisationSteps]("organisations", (taskSteps, authContext) => taskSteps.organisations.visible(authContext))
+    Query[Traversal.V[Task], Traversal.V[User]]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext)),
+    Query[Traversal.V[Task], Traversal.V[Log]]("logs", (taskSteps, _) => taskSteps.logs),
+    Query[Traversal.V[Task], Traversal.V[Case]]("case", (taskSteps, _) => taskSteps.`case`),
+    Query[Traversal.V[Task], Traversal.V[Organisation]]("organisations", (taskSteps, authContext) => taskSteps.organisations.visible(authContext))
   )
 
   def create: Action[AnyContent] =
@@ -86,10 +88,10 @@ class TaskCtrl @Inject() (
     entrypoint("list task")
       .authRoTransaction(db) { implicit request => implicit graph =>
         val tasks = taskSrv
-          .initSteps
+          .startTraversal
           .visible
           .richTask
-          .toList
+          .toSeq
         Success(Results.Ok(tasks.toJson))
       }
 
diff --git a/thehive/app/org/thp/thehive/controllers/v1/TaskRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/TaskRenderer.scala
index 2be0e41e5b..a4a6232337 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/TaskRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/TaskRenderer.scala
@@ -1,60 +1,72 @@
 package org.thp.thehive.controllers.v1
 
-import java.util.{Map => JMap}
+import java.util.{List => JList, Map => JMap}
+import java.lang.{Long => JLong}
 
-import gremlin.scala.{__, Graph, GremlinScala, Vertex}
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
-import org.thp.thehive.services.TaskSteps
-import play.api.libs.json._
-
-import scala.collection.JavaConverters._
+import org.thp.thehive.models.Task
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.TaskOps._
+import play.api.libs.json.{JsBoolean, JsNull, JsNumber, JsObject, JsString, JsValue}
 
 trait TaskRenderer {
 
-  def caseParent(taskSteps: TaskSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    taskSteps.`case`.richCase.fold.map(_.asScala.headOption.fold[JsValue](JsNull)(_.toJson))
+  def caseParent(implicit
+      authContext: AuthContext
+  ): Traversal.V[Task] => Traversal[JsValue, JList[JMap[String, Any]], Converter[JsValue, JList[JMap[String, Any]]]] =
+    _.`case`.richCase.fold.domainMap(_.headOption.fold[JsValue](JsNull)(_.toJson))
 
-  def caseParentId(taskSteps: TaskSteps): Traversal[JsValue, JsValue] =
-    taskSteps.`case`.fold.map(_.asScala.headOption.fold[JsValue](JsNull)(c => JsString(c.id().toString)))
+  def caseParentId: Traversal.V[Task] => Traversal[JsValue, JList[Vertex], Converter[JsValue, JList[Vertex]]] =
+    _.`case`.fold.domainMap(_.headOption.fold[JsValue](JsNull)(c => JsString(c._id)))
 
-  def caseTemplateParent(taskSteps: TaskSteps): Traversal[JsValue, JsValue] =
-    taskSteps.caseTemplate.richCaseTemplate.fold.map(_.asScala.headOption.fold[JsValue](JsNull)(_.toJson))
+  def caseTemplateParent: Traversal.V[Task] => Traversal[JsValue, JList[JMap[String, Any]], Converter[JsValue, JList[JMap[String, Any]]]] =
+    _.caseTemplate.richCaseTemplate.fold.domainMap(_.headOption.fold[JsValue](JsNull)(_.toJson))
 
-  def caseTemplateParentId(taskSteps: TaskSteps): Traversal[JsValue, JsValue] =
-    taskSteps.caseTemplate.fold.map(_.asScala.headOption.fold[JsValue](JsNull)(ct => JsString(ct.id().toString)))
+  def caseTemplateParentId: Traversal.V[Task] => Traversal[JsValue, JList[Vertex], Converter[JsValue, JList[Vertex]]] =
+    _.caseTemplate.fold.domainMap(_.headOption.fold[JsValue](JsNull)(ct => JsString(ct._id)))
 
-  def shareCount(taskSteps: TaskSteps): Traversal[JsValue, JsValue] =
-    taskSteps.organisations.count.map(c => JsNumber(c - 1))
+  def shareCount: Traversal.V[Task] => Traversal[JsValue, JLong, Converter[JsValue, JLong]] =
+    _.organisations.count.domainMap(count => JsNumber(count - 1))
 
-  def isOwner(taskSteps: TaskSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    taskSteps.origin.has("name", authContext.organisation).fold.map(l => JsBoolean(!l.isEmpty))
+  def isOwner(implicit authContext: AuthContext): Traversal.V[Task] => Traversal[JsBoolean, JList[Vertex], Converter[JsBoolean, JList[Vertex]]] =
+    _.origin.has("name", authContext.organisation).fold.domainMap(l => JsBoolean(l.nonEmpty))
 
-  def taskStatsRenderer(extraData: Set[String])(
-      implicit authContext: AuthContext,
-      db: Database,
-      graph: Graph
-  ): TaskSteps => Traversal[JsObject, JsObject] = {
-    def addData(f: TaskSteps => Traversal[JsValue, JsValue]): GremlinScala[JMap[String, JsValue]] => GremlinScala[JMap[String, JsValue]] =
-      _.by(f(new TaskSteps(__[Vertex])).raw.traversal)
+  def taskStatsRenderer(extraData: Set[String])(implicit
+      authContext: AuthContext
+  ): Traversal.V[Task] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { traversal =>
+    def addData[G](
+        name: String
+    )(f: Traversal.V[Task] => Traversal[JsValue, G, Converter[JsValue, G]]): Traversal[JsObject, JMap[String, Any], Converter[
+      JsObject,
+      JMap[String, Any]
+    ]] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] = { t =>
+      val dataTraversal = f(traversal.start)
+      t.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.by(dataTraversal.raw)) { jmap =>
+        t.converter(jmap) + (name -> dataTraversal.converter(jmap.get(name).asInstanceOf[G]))
+      }
+    }
 
-    if (extraData.isEmpty) _.constant(JsObject.empty)
+    if (extraData.isEmpty) traversal.constant2[JsObject, JMap[String, Any]](JsObject.empty)
     else {
       val dataName = extraData.toSeq
-      dataName
-        .foldLeft[TaskSteps => GremlinScala[JMap[String, JsValue]]](_.raw.project(dataName.head, dataName.tail: _*)) {
-          case (f, "case")           => f.andThen(addData(caseParent))
-          case (f, "caseId")         => f.andThen(addData(caseParentId))
-          case (f, "caseTemplate")   => f.andThen(addData(caseTemplateParent))
-          case (f, "caseTemplateId") => f.andThen(addData(caseTemplateParentId))
-          case (f, "isOwner")        => f.andThen(addData(isOwner))
-          case (f, "shareCount")     => f.andThen(addData(shareCount))
-          case (f, _)                => f.andThen(_.by(__.constant(JsNull).traversal))
-        }
-        .andThen(f => Traversal(f.map(m => JsObject(m.asScala))))
+      dataName.foldLeft[Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]]](
+        traversal.onRawMap[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]](_.project(dataName.head, dataName.tail: _*))(_ =>
+          JsObject.empty
+        )
+      ) {
+        case (f, "case")           => addData("case")(caseParent)(f)
+        case (f, "caseId")         => addData("caseId")(caseParentId)(f)
+        case (f, "caseTemplate")   => addData("caseTemplate")(caseTemplateParent)(f)
+        case (f, "caseTemplateId") => addData("caseTemplateId")(caseTemplateParentId)(f)
+        case (f, "isOwner")        => addData("isOwner")(isOwner)(f)
+        case (f, "shareCount")     => addData("shareCount")(shareCount)(f)
+        case (f, _)                => f
+      }
     }
   }
 }
diff --git a/thehive/app/org/thp/thehive/controllers/v1/TheHiveQueryExecutor.scala b/thehive/app/org/thp/thehive/controllers/v1/TheHiveQueryExecutor.scala
index 3c64ee9dc4..43e621a510 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/TheHiveQueryExecutor.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/TheHiveQueryExecutor.scala
@@ -2,7 +2,7 @@ package org.thp.thehive.controllers.v1
 
 import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{FObject, FieldsParser}
-import org.thp.scalligraph.models.Database
+import org.thp.scalligraph.models.{Database, UMapping}
 import org.thp.scalligraph.query._
 
 case class OutputParam(from: Long, to: Long, extraData: Set[String])
@@ -37,7 +37,15 @@ class TheHiveQueryExecutor @Inject() (
     caseCtrl :: taskCtrl :: alertCtrl :: userCtrl :: caseTemplateCtrl :: organisationCtrl :: auditCtrl :: observableCtrl :: logCtrl :: Nil
   override val version: (Int, Int) = 1 -> 1
 
-  override lazy val publicProperties: List[PublicProperty[_, _]] = controllers.flatMap(_.publicProperties)
+  def metaProperties: List[PublicProperty[_, _]] =
+    PublicPropertyListBuilder[Product]
+      .property("_createdBy", UMapping.string)(_.field.readonly)
+      .property("_createdAt", UMapping.date)(_.field.readonly)
+      .property("_updatedBy", UMapping.string.optional)(_.field.readonly)
+      .property("_updatedAt", UMapping.date.optional)(_.field.readonly)
+      .build
+
+  override lazy val publicProperties: List[PublicProperty[_, _]] = controllers.flatMap(_.publicProperties) ::: metaProperties
 
   override lazy val queries: Seq[ParamQuery[_]] =
     controllers.map(_.initialQuery) :::
diff --git a/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
index 0a158d4821..ddaef19e66 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/UserCtrl.scala
@@ -7,25 +7,26 @@ import org.thp.scalligraph.auth.AuthSrv
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PublicProperty, Query}
-import org.thp.scalligraph.steps.PagedResult
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{IteratorOutput, Traversal}
 import org.thp.scalligraph.{AuthorizationError, BadRequestError, NotFoundError, RichOptionTry}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputUser
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.TaskOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.http.HttpEntity
 import play.api.libs.json.{JsNull, JsObject, Json}
 import play.api.mvc._
 
-import scala.collection.JavaConverters._
-import scala.concurrent.ExecutionContext
 import scala.util.{Failure, Success, Try}
 
 @Singleton
 class UserCtrl @Inject() (
     entrypoint: Entrypoint,
-    @Named("with-thehive-schema") db: Database,
     properties: Properties,
     userSrv: UserSrv,
     authSrv: AuthSrv,
@@ -33,40 +34,40 @@ class UserCtrl @Inject() (
     profileSrv: ProfileSrv,
     auditSrv: AuditSrv,
     attachmentSrv: AttachmentSrv,
-    implicit val ec: ExecutionContext
+    @Named("with-thehive-schema") implicit val db: Database
 ) extends QueryableCtrl {
 
   override val entityName: String                           = "user"
-  override val publicProperties: List[PublicProperty[_, _]] = properties.user ::: metaProperties[UserSteps]
+  override val publicProperties: List[PublicProperty[_, _]] = properties.user
 
   override val initialQuery: Query =
-    Query.init[UserSteps]("listUser", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).users)
+    Query.init[Traversal.V[User]]("listUser", (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).users)
 
-  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, UserSteps](
+  override val getQuery: ParamQuery[IdOrName] = Query.initWithParam[IdOrName, Traversal.V[User]](
     "getUser",
     FieldsParser[IdOrName],
     (param, graph, authContext) => userSrv.get(param.idOrName)(graph).visible(authContext)
   )
 
-  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, UserSteps, PagedResult[RichUser]](
+  override val pageQuery: ParamQuery[OutputParam] = Query.withParam[OutputParam, Traversal.V[User], IteratorOutput](
     "page",
     FieldsParser[OutputParam],
     (range, userSteps, authContext) => userSteps.richUser(authContext).page(range.from, range.to, range.extraData.contains("total"))
   )
   override val outputQuery: Query =
-    Query.outputWithContext[RichUser, UserSteps]((userSteps, authContext) => userSteps.richUser(authContext))
+    Query.outputWithContext[RichUser, Traversal.V[User]]((userSteps, authContext) => userSteps.richUser(authContext))
 
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
-    Query.init[UserSteps]("currentUser", (graph, authContext) => userSrv.current(graph, authContext)),
-    Query[UserSteps, TaskSteps]("tasks", (userSteps, authContext) => userSteps.tasks.visible(authContext)),
-    Query[UserSteps, CaseSteps]("cases", (userSteps, authContext) => userSteps.cases.visible(authContext))
+    Query.init[Traversal.V[User]]("currentUser", (graph, authContext) => userSrv.current(graph, authContext)),
+    Query[Traversal.V[User], Traversal.V[Task]]("tasks", (userSteps, authContext) => userSteps.tasks.visible(authContext)),
+    Query[Traversal.V[User], Traversal.V[Case]]("cases", (userSteps, authContext) => userSteps.cases.visible(authContext))
   )
   def current: Action[AnyContent] =
     entrypoint("current user")
       .authRoTransaction(db) { implicit request => implicit graph =>
         userSrv
           .current
-          .richUserWithCustomRenderer(request.organisation, _.organisationWithRole.map(_.asScala.toSeq))
+          .richUserWithCustomRenderer(request.organisation, _.organisationWithRole)
           .getOrFail("User")
           .map(user =>
             Results
@@ -82,23 +83,22 @@ class UserCtrl @Inject() (
       .auth { implicit request =>
         val inputUser: InputUser = request.body("user")
         db.tryTransaction { implicit graph =>
-            val organisationName = inputUser.organisation.getOrElse(request.organisation)
-            for {
-              _            <- userSrv.current.organisations(Permissions.manageUser).get(organisationName).existsOrFail()
-              organisation <- organisationSrv.getOrFail(organisationName)
-              profile      <- profileSrv.getOrFail(inputUser.profile)
-              user         <- userSrv.addOrCreateUser(inputUser.toUser, inputUser.avatar, organisation, profile)
-            } yield user -> userSrv.canSetPassword(user.user)
-          }
-          .flatMap {
-            case (user, true) =>
-              inputUser
-                .password
-                .map(password => authSrv.setPassword(user._id, password))
-                .flip
-                .map(_ => Results.Created(user.toJson))
-            case (user, _) => Success(Results.Created(user.toJson))
-          }
+          val organisationName = inputUser.organisation.getOrElse(request.organisation)
+          for {
+            _            <- userSrv.current.organisations(Permissions.manageUser).getByName(organisationName).existsOrFail
+            organisation <- organisationSrv.getOrFail(organisationName)
+            profile      <- profileSrv.getOrFail(inputUser.profile)
+            user         <- userSrv.addOrCreateUser(inputUser.toUser, inputUser.avatar, organisation, profile)
+          } yield user -> userSrv.canSetPassword(user.user)
+        }.flatMap {
+          case (user, true) =>
+            inputUser
+              .password
+              .map(password => authSrv.setPassword(user._id, password))
+              .flip
+              .map(_ => Results.Created(user.toJson))
+          case (user, _) => Success(Results.Created(user.toJson))
+        }
       }
 
   def lock(userId: String): Action[AnyContent] =
@@ -148,7 +148,7 @@ class UserCtrl @Inject() (
           userSrv
             .current
             .get(userId)
-            .exists()
+            .exists
 
         val isUserAdmin: Boolean =
           userSrv
@@ -156,7 +156,7 @@ class UserCtrl @Inject() (
             .organisations(Permissions.manageUser)
             .users
             .get(userId)
-            .exists()
+            .exists
 
         def requireAdmin[A](body: => Try[A]): Try[A] =
           if (isUserAdmin) body else Failure(AuthorizationError("You are not permitted to update this user"))
@@ -167,10 +167,14 @@ class UserCtrl @Inject() (
             auditSrv
               .mergeAudits {
                 for {
-                  updateName <- maybeName.map(name => userSrv.get(user).update("name" -> name).map(_ => Json.obj("name" -> name))).flip
-                  updateLocked <- maybeLocked
-                    .map(locked => requireAdmin(if (locked) userSrv.lock(user) else userSrv.unlock(user)).map(_ => Json.obj("locked" -> locked)))
-                    .flip
+                  updateName <-
+                    maybeName
+                      .map(name => userSrv.get(user).update(_.name, name).domainMap(_ => Json.obj("name" -> name)).getOrFail("User"))
+                      .flip
+                  updateLocked <-
+                    maybeLocked
+                      .map(locked => requireAdmin(if (locked) userSrv.lock(user) else userSrv.unlock(user)).map(_ => Json.obj("locked" -> locked)))
+                      .flip
                   updateProfile <- maybeProfile.map { profileName =>
                     requireAdmin {
                       maybeOrganisation.fold[Try[JsObject]](Failure(BadRequestError("Organisation information is required to update user profile"))) {
@@ -286,7 +290,7 @@ class UserCtrl @Inject() (
   def avatar(userId: String): Action[AnyContent] =
     entrypoint("get user avatar")
       .authTransaction(db) { implicit request => implicit graph =>
-        userSrv.get(userId).visible.avatar.headOption() match {
+        userSrv.get(userId).visible.avatar.headOption match {
           case Some(avatar) if attachmentSrv.exists(avatar) =>
             Success(
               Result(
diff --git a/thehive/app/org/thp/thehive/models/Alert.scala b/thehive/app/org/thp/thehive/models/Alert.scala
index 75ca024c34..e99d6f75e3 100644
--- a/thehive/app/org/thp/thehive/models/Alert.scala
+++ b/thehive/app/org/thp/thehive/models/Alert.scala
@@ -6,7 +6,7 @@ import io.scalaland.chimney.dsl._
 import org.thp.scalligraph._
 import org.thp.scalligraph.models.{DefineIndex, Entity, IndexType}
 
-@EdgeEntity[Alert, CustomField]
+@BuildEdgeEntity[Alert, CustomField]
 case class AlertCustomField(
     order: Option[Int] = None,
     stringValue: Option[String] = None,
@@ -23,22 +23,22 @@ case class AlertCustomField(
   override def dateValue_=(value: Option[Date]): AlertCustomField       = copy(dateValue = value)
 }
 
-@EdgeEntity[Alert, Observable]
+@BuildEdgeEntity[Alert, Observable]
 case class AlertObservable()
 
-@EdgeEntity[Alert, Organisation]
+@BuildEdgeEntity[Alert, Organisation]
 case class AlertOrganisation()
 
-@EdgeEntity[Alert, Case]
+@BuildEdgeEntity[Alert, Case]
 case class AlertCase()
 
-@EdgeEntity[Alert, CaseTemplate]
+@BuildEdgeEntity[Alert, CaseTemplate]
 case class AlertCaseTemplate()
 
-@EdgeEntity[Alert, Tag]
+@BuildEdgeEntity[Alert, Tag]
 case class AlertTag()
 
-@VertexEntity
+@BuildVertexEntity
 @DefineIndex(IndexType.basic, "type", "source", "sourceRef")
 case class Alert(
     `type`: String,
diff --git a/thehive/app/org/thp/thehive/models/Attachment.scala b/thehive/app/org/thp/thehive/models/Attachment.scala
index 7271cc3908..5bc2d396ef 100644
--- a/thehive/app/org/thp/thehive/models/Attachment.scala
+++ b/thehive/app/org/thp/thehive/models/Attachment.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.models
 
-import org.thp.scalligraph.VertexEntity
+import org.thp.scalligraph.BuildVertexEntity
 import org.thp.scalligraph.utils.Hash
 
-@VertexEntity
+@BuildVertexEntity
 case class Attachment(name: String, size: Long, contentType: String, hashes: Seq[Hash], attachmentId: String)
diff --git a/thehive/app/org/thp/thehive/models/Audit.scala b/thehive/app/org/thp/thehive/models/Audit.scala
index 3577823161..a3b0d18b18 100644
--- a/thehive/app/org/thp/thehive/models/Audit.scala
+++ b/thehive/app/org/thp/thehive/models/Audit.scala
@@ -2,16 +2,17 @@ package org.thp.thehive.models
 
 import java.util.Date
 
-import gremlin.scala.{Edge, Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.{Edge, Graph, Vertex}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.traversal.Converter
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@EdgeEntity[Audit, User]
+@BuildEdgeEntity[Audit, User]
 case class AuditUser()
 
 @DefineIndex(IndexType.basic, "requestId", "mainAction")
-@VertexEntity
+@BuildVertexEntity
 case class Audit(
     requestId: String,
     action: String,
@@ -24,7 +25,7 @@ case class Audit(
 object Audit {
 
   def apply(action: String, entity: Entity, details: Option[String] = None)(implicit authContext: AuthContext): Audit =
-    Audit(authContext.requestId, action, mainAction = false, Some(entity._id), Some(entity._model.label), details)
+    Audit(authContext.requestId, action, mainAction = false, Some(entity._id), Some(entity._label), details)
 
   final val create = "create"
   final val update = "update"
@@ -49,7 +50,12 @@ case class RichAudit(
 
 object RichAudit {
 
-  def apply(audit: Audit with Entity, context: Entity, visibilityContext: Entity, `object`: Option[Entity]): RichAudit =
+  def apply(
+      audit: Audit with Entity,
+      context: Product with Entity,
+      visibilityContext: Product with Entity,
+      `object`: Option[Product with Entity]
+  ): RichAudit =
     new RichAudit(
       audit._id,
       audit._createdAt,
@@ -68,27 +74,26 @@ object RichAudit {
 
 case class Audited()
 
-object Audited extends HasEdgeModel[Audited, Audit, Product] {
+object Audited {
 
-  override val model: Model.Edge[Audited, Audit, Product] = new EdgeModel[Audit, Product] { thisModel =>
+  val model: Model.Edge[Audited] = new EdgeModel { thisModel =>
     override type E = Audited
     override val label: String                                = "Audited"
-    override val fromLabel: String                            = "Audit"
-    override val toLabel: String                              = ""
     override val indexes: Seq[(IndexType.Value, Seq[String])] = Nil
 
     override val fields: Map[String, Mapping[_, _, _]] = Map.empty
-    override def toDomain(element: Edge)(implicit db: Database): Audited with Entity = new Audited with Entity {
-      override val _id: String                = element.id().toString
-      override val _model: Model              = thisModel
-      override val _createdBy: String         = db.getProperty(element, "_createdBy", UniMapping.string)
-      override val _updatedBy: Option[String] = db.getProperty(element, "_updatedBy", UniMapping.string.optional)
-      override val _createdAt: Date           = db.getProperty(element, "_createdAt", UniMapping.date)
-      override val _updatedAt: Option[Date]   = db.getProperty(element, "_updatedAt", UniMapping.date.optional)
-    }
+    override val converter: Converter[EEntity, Edge] = (element: Edge) =>
+      new Audited with Entity {
+        override val _id: String                = element.id().toString
+        override val _label: String             = "Audited"
+        override val _createdBy: String         = UMapping.string.getProperty(element, "_createdBy")
+        override val _updatedBy: Option[String] = UMapping.string.optional.getProperty(element, "_updatedBy")
+        override val _createdAt: Date           = UMapping.date.getProperty(element, "_createdAt")
+        override val _updatedAt: Option[Date]   = UMapping.date.optional.getProperty(element, "_updatedAt")
+      }
     override def addEntity(a: Audited, entity: Entity): EEntity = new Audited with Entity {
       override def _id: String                = entity._id
-      override def _model: Model              = entity._model
+      override def _label: String             = entity._label
       override def _createdBy: String         = entity._createdBy
       override def _updatedBy: Option[String] = entity._updatedBy
       override def _createdAt: Date           = entity._createdAt
@@ -99,27 +104,26 @@ object Audited extends HasEdgeModel[Audited, Audit, Product] {
 }
 case class AuditContext()
 
-object AuditContext extends HasEdgeModel[AuditContext, Audit, Product] {
+object AuditContext extends HasModel {
 
-  override val model: Model.Edge[AuditContext, Audit, Product] = new EdgeModel[Audit, Product] { thisModel =>
+  override val model: Model.Edge[AuditContext] = new EdgeModel { thisModel =>
     override type E = AuditContext
     override val label: String                                = "AuditContext"
-    override val fromLabel: String                            = "Audit"
-    override val toLabel: String                              = ""
     override val indexes: Seq[(IndexType.Value, Seq[String])] = Nil
 
     override val fields: Map[String, Mapping[_, _, _]] = Map.empty
-    override def toDomain(element: Edge)(implicit db: Database): AuditContext with Entity = new AuditContext with Entity {
-      override val _id: String                = element.id().toString
-      override val _model: Model              = thisModel
-      override val _createdBy: String         = db.getProperty(element, "_createdBy", UniMapping.string)
-      override val _updatedBy: Option[String] = db.getProperty(element, "_updatedBy", UniMapping.string.optional)
-      override val _createdAt: Date           = db.getProperty(element, "_createdAt", UniMapping.date)
-      override val _updatedAt: Option[Date]   = db.getProperty(element, "_updatedAt", UniMapping.date.optional)
-    }
+    override val converter: Converter[EEntity, Edge] = (element: Edge) =>
+      new AuditContext with Entity {
+        override val _id: String                = element.id().toString
+        override val _label: String             = "AuditContext"
+        override val _createdBy: String         = UMapping.string.getProperty(element, "_createdBy")
+        override val _updatedBy: Option[String] = UMapping.string.optional.getProperty(element, "_updatedBy")
+        override val _createdAt: Date           = UMapping.date.getProperty(element, "_createdAt")
+        override val _updatedAt: Option[Date]   = UMapping.date.optional.getProperty(element, "_updatedAt")
+      }
     override def addEntity(a: AuditContext, entity: Entity): EEntity = new AuditContext with Entity {
       override def _id: String                = entity._id
-      override def _model: Model              = entity._model
+      override def _label: String             = entity._label
       override def _createdBy: String         = entity._createdBy
       override def _updatedBy: Option[String] = entity._updatedBy
       override def _createdAt: Date           = entity._createdAt
diff --git a/thehive/app/org/thp/thehive/models/Case.scala b/thehive/app/org/thp/thehive/models/Case.scala
index 83e1d6ce1b..e476b48a85 100644
--- a/thehive/app/org/thp/thehive/models/Case.scala
+++ b/thehive/app/org/thp/thehive/models/Case.scala
@@ -4,7 +4,7 @@ import java.util.Date
 
 import org.thp.scalligraph._
 import org.thp.scalligraph.auth.Permission
-import org.thp.scalligraph.models.{DefineIndex, Entity, IndexType, Model}
+import org.thp.scalligraph.models.{DefineIndex, Entity, IndexType}
 import play.api.libs.json.{Format, Json}
 
 object CaseStatus extends Enumeration {
@@ -13,7 +13,7 @@ object CaseStatus extends Enumeration {
   implicit val format: Format[CaseStatus.Value] = Json.formatEnum(CaseStatus)
 }
 
-@VertexEntity
+@BuildVertexEntity
 @DefineIndex(IndexType.unique, "value")
 case class ResolutionStatus(value: String) {
   require(!value.isEmpty, "ResolutionStatus can't be empty")
@@ -29,10 +29,10 @@ object ResolutionStatus {
   val initialValues = Seq(indeterminate, falsePositive, truePositive, other, duplicated)
 }
 
-@EdgeEntity[Case, ResolutionStatus]
+@BuildEdgeEntity[Case, ResolutionStatus]
 case class CaseResolutionStatus()
 
-@VertexEntity
+@BuildVertexEntity
 @DefineIndex(IndexType.unique, "value")
 case class ImpactStatus(value: String) {
   require(!value.isEmpty, "ImpactStatus can't be empty")
@@ -45,16 +45,16 @@ object ImpactStatus {
   val initialValues: Seq[ImpactStatus] = Seq(noImpact, withImpact, notApplicable)
 }
 
-@EdgeEntity[Case, ImpactStatus]
+@BuildEdgeEntity[Case, ImpactStatus]
 case class CaseImpactStatus()
 
-@EdgeEntity[Case, Tag]
+@BuildEdgeEntity[Case, Tag]
 case class CaseTag()
 
-@EdgeEntity[Case, Case]
+@BuildEdgeEntity[Case, Case]
 case class MergedFrom()
 
-@EdgeEntity[Case, CustomField]
+@BuildEdgeEntity[Case, CustomField]
 case class CaseCustomField(
     order: Option[Int] = None,
     stringValue: Option[String] = None,
@@ -71,13 +71,13 @@ case class CaseCustomField(
   override def dateValue_=(value: Option[Date]): CaseCustomField       = copy(dateValue = value)
 }
 
-@EdgeEntity[Case, User]
+@BuildEdgeEntity[Case, User]
 case class CaseUser()
 
-@EdgeEntity[Case, CaseTemplate]
+@BuildEdgeEntity[Case, CaseTemplate]
 case class CaseCaseTemplate()
 
-@VertexEntity
+@BuildVertexEntity
 @DefineIndex(IndexType.unique, "number")
 //@DefineIndex(IndexType.fulltext, "title")
 //@DefineIndex(IndexType.fulltext, "description")
@@ -152,7 +152,7 @@ object RichCase {
   ): RichCase = {
     val `case`: Case with Entity = new Case(number, title, description, severity, startDate, endDate, flag, tlp, pap, status, summary) with Entity {
       override val _id: String                = __id
-      override val _model: Model              = Model.vertex[Case]
+      override val _label: String             = "Case"
       override val _createdBy: String         = __createdBy
       override val _updatedBy: Option[String] = __updatedBy
       override val _createdAt: Date           = __createdAt
diff --git a/thehive/app/org/thp/thehive/models/CaseTemplate.scala b/thehive/app/org/thp/thehive/models/CaseTemplate.scala
index 50ff5802b2..f4ac46c21b 100644
--- a/thehive/app/org/thp/thehive/models/CaseTemplate.scala
+++ b/thehive/app/org/thp/thehive/models/CaseTemplate.scala
@@ -3,12 +3,12 @@ package org.thp.thehive.models
 import java.util.Date
 
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@EdgeEntity[CaseTemplate, Organisation]
+@BuildEdgeEntity[CaseTemplate, Organisation]
 case class CaseTemplateOrganisation()
 
-@EdgeEntity[CaseTemplate, CustomField]
+@BuildEdgeEntity[CaseTemplate, CustomField]
 case class CaseTemplateCustomField(
     order: Option[Int] = None,
     stringValue: Option[String] = None,
@@ -25,13 +25,13 @@ case class CaseTemplateCustomField(
   override def dateValue_=(value: Option[Date]): CaseTemplateCustomField       = copy(dateValue = value)
 }
 
-@EdgeEntity[CaseTemplate, Tag]
+@BuildEdgeEntity[CaseTemplate, Tag]
 case class CaseTemplateTag()
 
-@EdgeEntity[CaseTemplate, Task]
+@BuildEdgeEntity[CaseTemplate, Task]
 case class CaseTemplateTask()
 
-@VertexEntity
+@BuildVertexEntity
 case class CaseTemplate(
     name: String,
     displayName: String,
diff --git a/thehive/app/org/thp/thehive/models/Config.scala b/thehive/app/org/thp/thehive/models/Config.scala
index 1711a4268e..8432b3f663 100644
--- a/thehive/app/org/thp/thehive/models/Config.scala
+++ b/thehive/app/org/thp/thehive/models/Config.scala
@@ -1,13 +1,13 @@
 package org.thp.thehive.models
 
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 import play.api.libs.json.JsValue
 
-@VertexEntity
+@BuildVertexEntity
 case class Config(name: String, value: JsValue)
 
-@EdgeEntity[Organisation, Config]
+@BuildEdgeEntity[Organisation, Config]
 case class OrganisationConfig()
 
-@EdgeEntity[User, Config]
+@BuildEdgeEntity[User, Config]
 case class UserConfig()
diff --git a/thehive/app/org/thp/thehive/models/CustomField.scala b/thehive/app/org/thp/thehive/models/CustomField.scala
index 8a02b56930..508d7db7a3 100644
--- a/thehive/app/org/thp/thehive/models/CustomField.scala
+++ b/thehive/app/org/thp/thehive/models/CustomField.scala
@@ -1,9 +1,8 @@
 package org.thp.thehive.models
 
-import java.util.Date
+import java.util.{Date, NoSuchElementException}
 
-import gremlin.scala.Edge
-import javax.inject.Named
+import org.apache.tinkerpop.gremlin.structure.Edge
 import org.thp.scalligraph._
 import org.thp.scalligraph.models._
 import play.api.libs.json._
@@ -25,49 +24,49 @@ trait CustomFieldValue[C] extends Product {
   def dateValue_=(value: Option[Date]): C
 }
 
-class CustomFieldValueEdge(@Named("with-thehive-schema") db: Database, edge: Edge) extends CustomFieldValue[CustomFieldValueEdge] with Entity {
-  override def order: Option[Int]            = db.getOptionProperty(edge, "order", UniMapping.int.optional)
-  override def stringValue: Option[String]   = db.getOptionProperty(edge, "stringValue", UniMapping.string.optional)
-  override def booleanValue: Option[Boolean] = db.getOptionProperty(edge, "booleanValue", UniMapping.boolean.optional)
-  override def integerValue: Option[Int]     = db.getOptionProperty(edge, "integerValue", UniMapping.int.optional)
-  override def floatValue: Option[Double]    = db.getOptionProperty(edge, "floatValue", UniMapping.double.optional)
-  override def dateValue: Option[Date]       = db.getOptionProperty(edge, "dateValue", UniMapping.date.optional)
+class CustomFieldValueEdge(edge: Edge) extends CustomFieldValue[CustomFieldValueEdge] with Entity {
+  override def order: Option[Int]            = UMapping.int.optional.getProperty(edge, "order")
+  override def stringValue: Option[String]   = UMapping.string.optional.getProperty(edge, "stringValue")
+  override def booleanValue: Option[Boolean] = UMapping.boolean.optional.getProperty(edge, "booleanValue")
+  override def integerValue: Option[Int]     = UMapping.int.optional.getProperty(edge, "integerValue")
+  override def floatValue: Option[Double]    = UMapping.double.optional.getProperty(edge, "floatValue")
+  override def dateValue: Option[Date]       = UMapping.date.optional.getProperty(edge, "dateValue")
 
   override def order_=(value: Option[Int]): CustomFieldValueEdge = {
-    db.setProperty(edge, "order", value, UniMapping.int.optional)
+    UMapping.int.optional.setProperty(edge, "order", value)
     this
   }
 
   override def stringValue_=(value: Option[String]): CustomFieldValueEdge = {
-    db.setOptionProperty(edge, "stringValue", value, UniMapping.string.optional)
+    UMapping.string.optional.setProperty(edge, "stringValue", value)
     this
   }
   override def booleanValue_=(value: Option[Boolean]): CustomFieldValueEdge = {
-    db.setOptionProperty(edge, "booleanValue", value, UniMapping.boolean.optional)
+    UMapping.boolean.optional.setProperty(edge, "booleanValue", value)
     this
   }
   override def integerValue_=(value: Option[Int]): CustomFieldValueEdge = {
-    db.setOptionProperty(edge, "integerValue", value, UniMapping.int.optional)
+    UMapping.int.optional.setProperty(edge, "integerValue", value)
     this
   }
   override def floatValue_=(value: Option[Double]): CustomFieldValueEdge = {
-    db.setOptionProperty(edge, "floatValue", value, UniMapping.double.optional)
+    UMapping.double.optional.setProperty(edge, "floatValue", value)
     this
   }
   override def dateValue_=(value: Option[Date]): CustomFieldValueEdge = {
-    db.setOptionProperty(edge, "dateValue", value, UniMapping.date.optional)
+    UMapping.date.optional.setProperty(edge, "dateValue", value)
     this
   }
-  override def productElement(n: Int): Any  = ???
+  override def productElement(n: Int): Any  = throw new NoSuchElementException
   override def productArity: Int            = 0
   override def canEqual(that: Any): Boolean = that.isInstanceOf[CustomFieldValueEdge]
 
   override def _id: String                = edge.id().toString
-  override def _model: Model              = ???
-  override def _createdBy: String         = db.getSingleProperty(edge, "_createdBy", UniMapping.string)
-  override def _updatedBy: Option[String] = db.getOptionProperty(edge, "_updatedBy", UniMapping.string.optional)
-  override def _createdAt: Date           = db.getSingleProperty(edge, "_createdAt", UniMapping.date)
-  override def _updatedAt: Option[Date]   = db.getOptionProperty(edge, "_updatedAt", UniMapping.date.optional)
+  override def _label: String             = edge.label()
+  override def _createdBy: String         = UMapping.string.getProperty(edge, "_createdBy")
+  override def _updatedBy: Option[String] = UMapping.string.optional.getProperty(edge, "_updatedBy")
+  override def _createdAt: Date           = UMapping.date.getProperty(edge, "_createdAt")
+  override def _updatedAt: Option[Date]   = UMapping.date.optional.getProperty(edge, "_updatedAt")
 }
 
 object CustomFieldType extends Enumeration {
@@ -198,7 +197,7 @@ object CustomFieldDate extends CustomFieldType[Date] {
 }
 
 @DefineIndex(IndexType.unique, "name")
-@VertexEntity
+@BuildVertexEntity
 case class CustomField(
     name: String,
     displayName: String,
diff --git a/thehive/app/org/thp/thehive/models/Dashboard.scala b/thehive/app/org/thp/thehive/models/Dashboard.scala
index 56ed92fb8f..9110605f27 100644
--- a/thehive/app/org/thp/thehive/models/Dashboard.scala
+++ b/thehive/app/org/thp/thehive/models/Dashboard.scala
@@ -3,16 +3,16 @@ package org.thp.thehive.models
 import java.util.Date
 
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 import play.api.libs.json.JsObject
 
-@VertexEntity
+@BuildVertexEntity
 case class Dashboard(title: String, description: String, definition: JsObject)
 
-@EdgeEntity[Dashboard, User]
+@BuildEdgeEntity[Dashboard, User]
 case class DashboardUser()
 
-@EdgeEntity[Organisation, Dashboard]
+@BuildEdgeEntity[Organisation, Dashboard]
 case class OrganisationDashboard(writable: Boolean)
 
 case class RichDashboard(
diff --git a/thehive/app/org/thp/thehive/models/KeyValue.scala b/thehive/app/org/thp/thehive/models/KeyValue.scala
index 6c934ed907..c6b38c171a 100644
--- a/thehive/app/org/thp/thehive/models/KeyValue.scala
+++ b/thehive/app/org/thp/thehive/models/KeyValue.scala
@@ -2,13 +2,13 @@ package org.thp.thehive.models
 
 import java.util.Date
 
-import org.thp.scalligraph.VertexEntity
+import org.thp.scalligraph.BuildVertexEntity
 
 object ValueType extends Enumeration {
   val string, integer, float, boolean, date = Value
 }
 
-@VertexEntity
+@BuildVertexEntity
 case class KeyValue(
     namespace: String,
     predicate: String,
diff --git a/thehive/app/org/thp/thehive/models/Log.scala b/thehive/app/org/thp/thehive/models/Log.scala
index 39fa221ea5..a62f4fbef7 100644
--- a/thehive/app/org/thp/thehive/models/Log.scala
+++ b/thehive/app/org/thp/thehive/models/Log.scala
@@ -3,12 +3,12 @@ package org.thp.thehive.models
 import java.util.Date
 
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@EdgeEntity[Log, Attachment]
+@BuildEdgeEntity[Log, Attachment]
 case class LogAttachment()
 
-@VertexEntity
+@BuildVertexEntity
 case class Log(message: String, date: Date, deleted: Boolean)
 
 case class RichLog(log: Log with Entity, attachments: Seq[Attachment with Entity]) {
diff --git a/thehive/app/org/thp/thehive/models/Observable.scala b/thehive/app/org/thp/thehive/models/Observable.scala
index e35a474903..d3f4df1ea6 100644
--- a/thehive/app/org/thp/thehive/models/Observable.scala
+++ b/thehive/app/org/thp/thehive/models/Observable.scala
@@ -3,21 +3,21 @@ package org.thp.thehive.models
 import java.util.Date
 
 import org.thp.scalligraph.models.{DefineIndex, Entity, IndexType}
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@EdgeEntity[Observable, KeyValue]
+@BuildEdgeEntity[Observable, KeyValue]
 case class ObservableKeyValue()
 
-@EdgeEntity[Observable, Attachment]
+@BuildEdgeEntity[Observable, Attachment]
 case class ObservableAttachment()
 
-@EdgeEntity[Observable, Data]
+@BuildEdgeEntity[Observable, Data]
 case class ObservableData()
 
-@EdgeEntity[Observable, Tag]
+@BuildEdgeEntity[Observable, Tag]
 case class ObservableTag()
 
-@VertexEntity
+@BuildVertexEntity
 case class Observable(message: Option[String], tlp: Int, ioc: Boolean, sighted: Boolean)
 
 case class RichObservable(
@@ -42,5 +42,5 @@ case class RichObservable(
 }
 
 @DefineIndex(IndexType.unique, "data")
-@VertexEntity
+@BuildVertexEntity
 case class Data(data: String)
diff --git a/thehive/app/org/thp/thehive/models/ObservableType.scala b/thehive/app/org/thp/thehive/models/ObservableType.scala
index 910c3700f2..966ddf43cf 100644
--- a/thehive/app/org/thp/thehive/models/ObservableType.scala
+++ b/thehive/app/org/thp/thehive/models/ObservableType.scala
@@ -1,12 +1,12 @@
 package org.thp.thehive.models
 
 import org.thp.scalligraph.models.{DefineIndex, IndexType}
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@EdgeEntity[Observable, ObservableType]
+@BuildEdgeEntity[Observable, ObservableType]
 case class ObservableObservableType()
 
-@VertexEntity
+@BuildVertexEntity
 @DefineIndex(IndexType.unique, "name")
 case class ObservableType(name: String, isAttachment: Boolean)
 
diff --git a/thehive/app/org/thp/thehive/models/Organisation.scala b/thehive/app/org/thp/thehive/models/Organisation.scala
index ab6929e9f8..b06c516259 100644
--- a/thehive/app/org/thp/thehive/models/Organisation.scala
+++ b/thehive/app/org/thp/thehive/models/Organisation.scala
@@ -3,9 +3,9 @@ package org.thp.thehive.models
 import java.util.Date
 
 import org.thp.scalligraph.models.{DefineIndex, Entity, IndexType}
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@VertexEntity
+@BuildVertexEntity
 @DefineIndex(IndexType.unique, "name")
 case class Organisation(name: String, description: String)
 
@@ -14,10 +14,10 @@ object Organisation {
   val initialValues: Seq[Organisation] = Seq(administration)
 }
 
-@EdgeEntity[Organisation, Share]
+@BuildEdgeEntity[Organisation, Share]
 case class OrganisationShare()
 
-@EdgeEntity[Organisation, Organisation]
+@BuildEdgeEntity[Organisation, Organisation]
 case class OrganisationOrganisation()
 
 case class RichOrganisation(organisation: Organisation with Entity, links: Seq[Organisation with Entity]) {
diff --git a/thehive/app/org/thp/thehive/models/Page.scala b/thehive/app/org/thp/thehive/models/Page.scala
index 5d9d753772..de8cb049fa 100644
--- a/thehive/app/org/thp/thehive/models/Page.scala
+++ b/thehive/app/org/thp/thehive/models/Page.scala
@@ -1,9 +1,9 @@
 package org.thp.thehive.models
 
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@EdgeEntity[Organisation, Page]
+@BuildEdgeEntity[Organisation, Page]
 case class OrganisationPage()
 
-@VertexEntity
+@BuildVertexEntity
 case class Page(title: String, content: String, slug: String, order: Int, category: String)
diff --git a/thehive/app/org/thp/thehive/models/ReportTag.scala b/thehive/app/org/thp/thehive/models/ReportTag.scala
index dfb15d53b8..2ca6874884 100644
--- a/thehive/app/org/thp/thehive/models/ReportTag.scala
+++ b/thehive/app/org/thp/thehive/models/ReportTag.scala
@@ -1,14 +1,14 @@
 package org.thp.thehive.models
 
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 import play.api.libs.json.JsValue
 
 object ReportTagLevel extends Enumeration {
   val info, safe, suspicious, malicious = Value
 }
 
-@EdgeEntity[Observable, ReportTag]
+@BuildEdgeEntity[Observable, ReportTag]
 case class ObservableReportTag()
 
-@VertexEntity
+@BuildVertexEntity
 case class ReportTag(origin: String, level: ReportTagLevel.Value, namespace: String, predicate: String, value: JsValue)
diff --git a/thehive/app/org/thp/thehive/models/Role.scala b/thehive/app/org/thp/thehive/models/Role.scala
index f91b93732b..51a2bc80cd 100644
--- a/thehive/app/org/thp/thehive/models/Role.scala
+++ b/thehive/app/org/thp/thehive/models/Role.scala
@@ -2,13 +2,13 @@ package org.thp.thehive.models
 
 import org.thp.scalligraph.auth.Permission
 import org.thp.scalligraph.models.{DefineIndex, IndexType}
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@VertexEntity
+@BuildVertexEntity
 case class Role()
 
 @DefineIndex(IndexType.unique, "name")
-@VertexEntity
+@BuildVertexEntity
 case class Profile(name: String, permissions: Set[Permission]) {
   def isEditable: Boolean = name != Profile.admin.name && name != Profile.orgAdmin.name
 }
@@ -34,8 +34,8 @@ object Profile {
   val initialValues: Seq[Profile] = Seq(admin, orgAdmin, analyst, readonly)
 }
 
-@EdgeEntity[Role, Profile]
+@BuildEdgeEntity[Role, Profile]
 case class RoleProfile()
 
-@EdgeEntity[Role, Organisation]
+@BuildEdgeEntity[Role, Organisation]
 case class RoleOrganisation()
diff --git a/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala b/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala
index 0e355893e0..4d8d180daa 100644
--- a/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala
+++ b/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala
@@ -11,8 +11,8 @@ import org.thp.thehive.ClusterSetup
 import org.thp.thehive.services.LocalUserSrv
 import play.api.Logger
 
-import scala.concurrent.{Await, ExecutionContext}
 import scala.concurrent.duration.DurationInt
+import scala.concurrent.{Await, ExecutionContext}
 import scala.util.{Failure, Try}
 
 @Singleton
diff --git a/thehive/app/org/thp/thehive/models/Share.scala b/thehive/app/org/thp/thehive/models/Share.scala
index bac9455637..2ea59c2aea 100644
--- a/thehive/app/org/thp/thehive/models/Share.scala
+++ b/thehive/app/org/thp/thehive/models/Share.scala
@@ -3,21 +3,21 @@ package org.thp.thehive.models
 import java.util.Date
 
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 
-@VertexEntity
+@BuildVertexEntity
 case class Share(owner: Boolean)
 
-@EdgeEntity[Share, Case]
+@BuildEdgeEntity[Share, Case]
 case class ShareCase()
 
-@EdgeEntity[Share, Observable]
+@BuildEdgeEntity[Share, Observable]
 case class ShareObservable()
 
-@EdgeEntity[Share, Task]
+@BuildEdgeEntity[Share, Task]
 case class ShareTask()
 
-@EdgeEntity[Share, Profile]
+@BuildEdgeEntity[Share, Profile]
 case class ShareProfile()
 
 case class RichShare(share: Share with Entity, caseId: String, organisationName: String, profileName: String) {
diff --git a/thehive/app/org/thp/thehive/models/Tag.scala b/thehive/app/org/thp/thehive/models/Tag.scala
index efedb4e4dc..e188ee45c2 100644
--- a/thehive/app/org/thp/thehive/models/Tag.scala
+++ b/thehive/app/org/thp/thehive/models/Tag.scala
@@ -1,6 +1,6 @@
 package org.thp.thehive.models
 
-import org.thp.scalligraph.VertexEntity
+import org.thp.scalligraph.BuildVertexEntity
 import org.thp.scalligraph.models.{DefineIndex, IndexType}
 import play.api.Logger
 
@@ -8,7 +8,7 @@ import scala.util.Try
 import scala.util.matching.Regex
 
 @DefineIndex(IndexType.unique, "namespace", "predicate", "value")
-@VertexEntity
+@BuildVertexEntity
 case class Tag(
     namespace: String,
     predicate: String,
diff --git a/thehive/app/org/thp/thehive/models/Task.scala b/thehive/app/org/thp/thehive/models/Task.scala
index 44a56db2a4..9468250450 100644
--- a/thehive/app/org/thp/thehive/models/Task.scala
+++ b/thehive/app/org/thp/thehive/models/Task.scala
@@ -12,13 +12,13 @@ object TaskStatus extends Enumeration {
   implicit val format: Format[Value] = Json.formatEnum(TaskStatus)
 }
 
-@EdgeEntity[Task, User]
+@BuildEdgeEntity[Task, User]
 case class TaskUser()
 
-@EdgeEntity[Task, Log]
+@BuildEdgeEntity[Task, Log]
 case class TaskLog()
 
-@VertexEntity
+@BuildVertexEntity
 @DefineIndex(IndexType.basic, "status")
 case class Task(
     title: String,
diff --git a/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala b/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
index 15bb072aa9..926fe35def 100644
--- a/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
+++ b/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
@@ -2,8 +2,8 @@ package org.thp.thehive.models
 
 import java.lang.reflect.Modifier
 
-import gremlin.scala.{Graph, Key}
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.janusgraph.core.schema.ConsistencyModifier
 import org.janusgraph.graphdb.types.TypeDefinitionCategory
 import org.reflections.Reflections
@@ -12,7 +12,7 @@ import org.reflections.util.ConfigurationBuilder
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.janus.JanusDatabase
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import play.api.Logger
 import play.api.inject.Injector
 
@@ -30,7 +30,7 @@ class TheHiveSchemaDefinition @Inject() (injector: Injector) extends Schema with
   val operations: Operations = Operations(name)
     .addProperty[Option[Boolean]]("Observable", "seen")
     .updateGraph("Add manageConfig permission to org-admin profile", "Profile") { traversal =>
-      Try(traversal.has("name", "org-admin").raw.property(Key("permissions") -> "manageConfig").iterate())
+      Try(traversal.has("name", "org-admin").raw.property("permissions", "manageConfig").iterate())
       Success(())
     }
     .updateGraph("Remove duplicate custom fields", "CustomField") { traversal =>
@@ -81,11 +81,11 @@ class TheHiveSchemaDefinition @Inject() (injector: Injector) extends Schema with
   override lazy val modelList: Seq[Model] = {
     val rm: ru.Mirror = ru.runtimeMirror(getClass.getClassLoader)
     reflectionClasses
-      .getSubTypesOf(classOf[HasModel[_]])
+      .getSubTypesOf(classOf[HasModel])
       .asScala
       .filterNot(c => Modifier.isAbstract(c.getModifiers))
       .map { modelClass =>
-        val hasModel = rm.reflectModule(rm.classSymbol(modelClass).companion.companion.asModule).instance.asInstanceOf[HasModel[_]]
+        val hasModel = rm.reflectModule(rm.classSymbol(modelClass).companion.companion.asModule).instance.asInstanceOf[HasModel]
         logger.info(s"Loading model ${hasModel.model.label}")
         hasModel.model
       }
diff --git a/thehive/app/org/thp/thehive/models/User.scala b/thehive/app/org/thp/thehive/models/User.scala
index 2eb2a91f69..670d36b9d5 100644
--- a/thehive/app/org/thp/thehive/models/User.scala
+++ b/thehive/app/org/thp/thehive/models/User.scala
@@ -4,17 +4,17 @@ import java.util.Date
 
 import org.thp.scalligraph.auth.{Permission, User => ScalligraphUser}
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.{EdgeEntity, VertexEntity}
+import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity}
 import org.thp.thehive.services.LocalPasswordAuthSrv
 
-@EdgeEntity[User, Role]
+@BuildEdgeEntity[User, Role]
 case class UserRole()
 
-@EdgeEntity[User, Attachment]
+@BuildEdgeEntity[User, Attachment]
 case class UserAttachment()
 
 @DefineIndex(IndexType.unique, "login")
-@VertexEntity
+@BuildVertexEntity
 case class User(login: String, name: String, apikey: Option[String], locked: Boolean, password: Option[String], totpSecret: Option[String])
     extends ScalligraphUser {
   override val id: String          = login
diff --git a/thehive/app/org/thp/thehive/services/AlertSrv.scala b/thehive/app/org/thp/thehive/services/AlertSrv.scala
index 2f0a318c99..58eb721421 100644
--- a/thehive/app/org/thp/thehive/services/AlertSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AlertSrv.scala
@@ -1,23 +1,27 @@
 package org.thp.thehive.services
 
 import java.lang.{Long => JLong}
-import java.util.{Date, Collection => JCollection, List => JList, Map => JMap}
+import java.util.{Date, List => JList, Map => JMap}
 
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
-import org.apache.tinkerpop.gremlin.process.traversal.Path
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
-import org.thp.scalligraph.{CreateError, EntitySteps, InternalError, RichJMap, RichOptionTry, RichSeq}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.{CreateError, RichOptionTry, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.CustomFieldOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
 import play.api.libs.json.{JsObject, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.{Failure, Try}
 
 @Singleton
@@ -31,7 +35,7 @@ class AlertSrv @Inject() (
     auditSrv: AuditSrv
 )(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[Alert, AlertSteps] {
+) extends VertexSrv[Alert] {
 
   val alertTagSrv          = new EdgeSrv[AlertTag, Alert, Tag]
   val alertCustomFieldSrv  = new EdgeSrv[AlertCustomField, Alert, CustomField]
@@ -40,8 +44,8 @@ class AlertSrv @Inject() (
   val alertCaseTemplateSrv = new EdgeSrv[AlertCaseTemplate, Alert, CaseTemplate]
   val alertObservableSrv   = new EdgeSrv[AlertObservable, Alert, Observable]
 
-  override def get(idOrSource: String)(implicit graph: Graph): AlertSteps = idOrSource.split(';') match {
-    case Array(tpe, source, sourceRef) => initSteps.getBySourceId(tpe, source, sourceRef)
+  override def get(idOrSource: String)(implicit graph: Graph): Traversal.V[Alert] = idOrSource.split(';') match {
+    case Array(tpe, source, sourceRef) => startTraversal.getBySourceId(tpe, source, sourceRef)
     case _                             => super.getByIds(idOrSource)
   }
 
@@ -83,14 +87,14 @@ class AlertSrv @Inject() (
   }
 
   override def update(
-      steps: AlertSteps,
+      traversal: Traversal.V[Alert],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(AlertSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
-      case (alertSteps, updatedFields) =>
-        alertSteps
-          .newInstance()
-          .getOrFail()
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Alert], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
+      case (alerts, updatedFields) =>
+        alerts
+          .clone()
+          .getOrFail("Alert")
           .flatMap(auditSrv.alert.update(_, updatedFields))
     }
 
@@ -117,7 +121,7 @@ class AlertSrv @Inject() (
   def addTags(alert: Alert with Entity, tags: Set[String])(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
     val currentTags = get(alert)
       .tags
-      .toList
+      .toSeq
       .map(_.toString)
       .toSet
     for {
@@ -130,8 +134,8 @@ class AlertSrv @Inject() (
   def removeObservable(alert: Alert with Entity, observable: Observable with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     observableSrv
       .get(observable)
-      .inToE[AlertObservable]
-      .filter(_.outV().hasId(alert._id))
+      .inE[AlertObservable]
+      .filter(_.outV.hasId(alert._id))
       .getOrFail("Observable")
       .flatMap { alertObservable =>
         alertObservableSrv.get(alertObservable).remove()
@@ -147,7 +151,7 @@ class AlertSrv @Inject() (
       .similar
       .alert
       .hasId(alert._id)
-      .exists()
+      .exists
     if (alreadyExistInThatCase)
       Failure(CreateError("Observable already exists"))
     else
@@ -173,14 +177,14 @@ class AlertSrv @Inject() (
       authContext: AuthContext
   ): Try[Unit] = {
     val cfv = get(alert).customFields(customFieldName)
-    if (cfv.newInstance().exists())
+    if (cfv.clone().exists)
       cfv.setValue(value)
     else
       createCustomField(alert, customFieldName, value).map(_ => ())
   }
 
   def getCustomField(alert: Alert with Entity, customFieldName: String)(implicit graph: Graph): Option[RichCustomField] =
-    get(alert).customFields(customFieldName).richCustomField.headOption()
+    get(alert).customFields(customFieldName).richCustomField.headOption
 
   def updateCustomField(
       alert: Alert with Entity,
@@ -200,25 +204,25 @@ class AlertSrv @Inject() (
 
   def markAsUnread(alertId: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
-      alert <- get(alertId).updateOne("read" -> false)
+      alert <- get(alertId).update(_.read, false: Boolean).getOrFail("Alert")
       _     <- auditSrv.alert.update(alert, Json.obj("read" -> false))
     } yield ()
 
   def markAsRead(alertId: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
-      alert <- get(alertId).updateOne("read" -> true)
+      alert <- get(alertId).update(_.read, true: Boolean).getOrFail("Alert")
       _     <- auditSrv.alert.update(alert, Json.obj("read" -> true))
     } yield ()
 
   def followAlert(alertId: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
-      alert <- get(alertId).updateOne("follow" -> true)
+      alert <- get(alertId).update(_.follow, true: Boolean).getOrFail("Alert")
       _     <- auditSrv.alert.update(alert, Json.obj("follow" -> true))
     } yield ()
 
   def unfollowAlert(alertId: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
-      alert <- get(alertId).updateOne("follow" -> false)
+      alert <- get(alertId).update(_.follow, false: Boolean).getOrFail("Alert")
       _     <- auditSrv.alert.update(alert, Json.obj("follow" -> false))
     } yield ()
 
@@ -229,7 +233,7 @@ class AlertSrv @Inject() (
     for {
       caseTemplate <- alert
         .caseTemplate
-        .map(caseTemplateSrv.get(_).richCaseTemplate.getOrFail())
+        .map(caseTemplateSrv.get(_).richCaseTemplate.getOrFail("CaseTemplate"))
         .flip
       customField = alert.customFields.map(f => (f.name, f.value, f.order))
       case0 = Case(
@@ -261,9 +265,9 @@ class AlertSrv @Inject() (
 
   def mergeInCase(alert: Alert with Entity, `case`: Case with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Case with Entity] =
     for {
-      _ <- caseSrv.addTags(`case`, get(alert).tags.toList.map(_.toString).toSet)
+      _ <- caseSrv.addTags(`case`, get(alert).tags.toSeq.map(_.toString).toSet)
       description = `case`.description + s"\n  \n#### Merged with alert #${alert.sourceRef} ${alert.title}\n\n${alert.description.trim}"
-      c <- caseSrv.get(`case`).updateOne("description" -> description)
+      c <- caseSrv.get(`case`).update(_.description, description).getOrFail("Case")
       _ <- importObservables(alert, `case`)
       _ <- alertCaseSrv.create(AlertCase(), alert, `case`)
       _ <- markAsRead(alert._id)
@@ -293,208 +297,201 @@ class AlertSrv @Inject() (
       _ = get(alert).remove()
       _ <- auditSrv.alert.delete(alert, organisation)
     } yield ()
-
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): AlertSteps = new AlertSteps(raw)
 }
 
-@EntitySteps[Alert]
-class AlertSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Alert](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex] = raw): AlertSteps = new AlertSteps(newRaw)
-
-  def get(idOrSource: String): AlertSteps = idOrSource.split(';') match {
-    case Array(tpe, source, sourceRef) => getBySourceId(tpe, source, sourceRef)
-    case _                             => this.getByIds(idOrSource)
-  }
+object AlertOps {
 
-  def getBySourceId(`type`: String, source: String, sourceRef: String): AlertSteps =
-    this
-      .has("type", `type`)
-      .has("source", source)
-      .has("sourceRef", sourceRef)
+  implicit class AlertOpsDefs(traversal: Traversal.V[Alert]) {
+    def get(idOrSource: String): Traversal.V[Alert] = idOrSource.split(';') match {
+      case Array(tpe, source, sourceRef) => getBySourceId(tpe, source, sourceRef)
+      case _                             => traversal.getByIds(idOrSource)
+    }
 
-  def organisation: OrganisationSteps = new OrganisationSteps(raw.outTo[AlertOrganisation])
+    def getBySourceId(`type`: String, source: String, sourceRef: String): Traversal.V[Alert] =
+      traversal
+        .has("type", `type`)
+        .has("source", source)
+        .has("sourceRef", sourceRef)
 
-  def tags: TagSteps = new TagSteps(raw.outTo[AlertTag])
+    def organisation: Traversal.V[Organisation] = traversal.out[AlertOrganisation].v[Organisation]
 
-  def `case`: CaseSteps = new CaseSteps(raw.outTo[AlertCase])
+    def tags: Traversal.V[Tag] = traversal.out[AlertTag].v[Tag]
 
-  def removeTags(tags: Set[Tag with Entity]): Unit =
-    if (tags.nonEmpty)
-      this.outToE[AlertTag].filter(_.otherV().hasId(tags.map(_._id).toSeq: _*)).remove()
+    def `case`: Traversal.V[Case] = traversal.out[AlertCase].v[Case]
 
-  def visible(implicit authContext: AuthContext): AlertSteps =
-    this.filter(
-      _.outTo[AlertOrganisation]
-        .has("name", authContext.organisation)
-    )
+    def removeTags(tags: Set[Tag with Entity]): Unit =
+      if (tags.nonEmpty)
+        traversal.outE[AlertTag].filter(_.otherV.hasId(tags.map(_._id).toSeq: _*)).remove()
 
-  def can(permission: Permission)(implicit authContext: AuthContext): AlertSteps =
-    if (authContext.permissions.contains(permission))
-      this.filter(
-        _.outTo[AlertOrganisation]
+    def visible(implicit authContext: AuthContext): Traversal.V[Alert] =
+      traversal.filter(
+        _.out[AlertOrganisation]
           .has("name", authContext.organisation)
       )
-    else this.limit(0)
-
-  def imported: Traversal[Boolean, Boolean] = this.outToE[AlertCase].count.map(_ > 0)
-
-  def similarCases(implicit authContext: AuthContext): Traversal[(RichCase, SimilarStats), (RichCase, SimilarStats)] =
-    observables
-      .similar
-      .visible
-      .groupBy(new ObservableSteps(__[Vertex]).`case`.raw)
-      .unfold[JMap.Entry[Vertex, JCollection[Vertex]]] // Map[Case, Seq[Observable]]
-      .project(
-        _.by(c =>
-          new CaseSteps(c.selectKeys.raw)
-            .project(
-              _.by(_.richCaseWithoutPerms)
-                .by(_.observables.groupCount(By(Key[Boolean]("ioc"))))
-            )
-        ).by(_.selectValues.unfold[Vertex].groupCount(By(Key[Boolean]("ioc"))))
-      )
-      .map {
-        case ((richCase, obsStats), similarStats) =>
-          val obsStatsMap     = obsStats.asScala.mapValues(_.toInt)
-          val similarStatsMap = similarStats.asScala.mapValues(_.toInt)
-          richCase -> SimilarStats(
-            similarStatsMap.values.sum         -> obsStatsMap.values.sum,
-            similarStatsMap.getOrElse(true, 0) -> obsStatsMap.getOrElse(true, 0)
-          )
-      }
 
-  def alertUserOrganisation(
-      permission: Permission
-  )(implicit authContext: AuthContext): Traversal[(RichAlert, Organisation with Entity), (RichAlert, Organisation with Entity)] = {
-    val alertLabel            = StepLabel[Vertex]()
-    val organisationLabel     = StepLabel[Vertex]()
-    val tagLabel              = StepLabel[JList[Vertex]]()
-    val customFieldLabel      = StepLabel[JList[Path]]()
-    val caseIdLabel           = StepLabel[JList[AnyRef]]()
-    val caseTemplateNameLabel = StepLabel[JList[String]]()
-    val observableCountLabel  = StepLabel[JLong]()
-    val result = Traversal(
-      raw
-        .`match`(
-          _.as(alertLabel).out("AlertOrganisation").has(Key("name") of authContext.organisation).as(organisationLabel),
-          _.as(alertLabel).out("AlertTag").fold().as(tagLabel),
-          _.as(alertLabel).outToE[AlertCustomField].inV().path.fold.as(customFieldLabel),
-          _.as(alertLabel).outTo[AlertCase].id().fold.as(caseIdLabel),
-          _.as(alertLabel).outTo[AlertCaseTemplate].values[String]("name").fold.as(caseTemplateNameLabel),
-          _.as(alertLabel).outToE[AlertObservable].count().as(observableCountLabel)
+    def can(permission: Permission)(implicit authContext: AuthContext): Traversal.V[Alert] =
+      if (authContext.permissions.contains(permission))
+        traversal.filter(
+          _.out[AlertOrganisation]
+            .has("name", authContext.organisation)
         )
-        .select(
-          alertLabel.name,
-          organisationLabel.name,
-          tagLabel.name,
-          customFieldLabel.name,
-          caseIdLabel.name,
-          caseTemplateNameLabel.name,
-          observableCountLabel.name
+      else traversal.limit(0)
+
+    def imported: Traversal[Boolean, JLong, Converter[Boolean, JLong]] = traversal.outE[AlertCase].count.domainMap(_ > 0)
+
+    def similarCases(
+        implicit authContext: AuthContext
+    ): Traversal[(RichCase, SimilarStats), JMap[String, Any], Converter[(RichCase, SimilarStats), JMap[String, Any]]] =
+      observables
+        .similar
+        .visible
+        .group(_.by(_.`case`))
+        .unfold
+        .project(
+          _.by(
+            _.selectKeys
+              .project(
+                _.by(_.richCaseWithoutPerms)
+                  .by((_: Traversal.V[Case]).observables.groupCount(_.byValue(_.ioc)))
+              )
+          ).by(_.selectValues.unfold.groupCount(_.byValue(_.ioc)))
         )
-        .map { resultMap =>
-          val organisation = resultMap.getValue(organisationLabel).as[Organisation]
-          val tags         = resultMap.getValue(tagLabel).asScala.map(_.as[Tag])
-          val customFieldValues = resultMap
-            .getValue(customFieldLabel)
-            .asScala
-            .map(_.asScala.takeRight(2).toList.asInstanceOf[List[Element]])
-            .map {
-              case List(acf, cf) => RichCustomField(cf.as[CustomField], acf.as[AlertCustomField])
-              case _             => throw InternalError("Not possible")
-            }
-
-          RichAlert(
-            resultMap.getValue(alertLabel).as[Alert],
-            organisation.name,
-            tags,
-            customFieldValues,
-            atMostOneOf(resultMap.getValue(caseIdLabel)).map(_.toString),
-            atMostOneOf(resultMap.getValue(caseTemplateNameLabel)),
-            resultMap.getValue(observableCountLabel)
-          ) -> organisation
+        .domainMap {
+          case ((richCase, obsStats), similarStats) =>
+            val obsStatsMap     = obsStats.mapValues(_.toInt)
+            val similarStatsMap = similarStats.mapValues(_.toInt)
+            richCase -> SimilarStats(
+              similarStatsMap.values.sum         -> obsStatsMap.values.sum,
+              similarStatsMap.getOrElse(true, 0) -> obsStatsMap.getOrElse(true, 0)
+            )
         }
-    )
-    if (authContext.permissions.contains(permission))
-      result
-    else
-      result.limit(0)
-  }
 
-  def customFields(name: String): CustomFieldValueSteps =
-    new CustomFieldValueSteps(raw.outToE[AlertCustomField].filter(_.inV().has(Key("name") of name)))
+    def alertUserOrganisation(
+        permission: Permission
+    )(
+        implicit authContext: AuthContext
+    ): Traversal[(RichAlert, Organisation with Entity), JMap[String, Any], Converter[(RichAlert, Organisation with Entity), JMap[String, Any]]] = {
+      val alertLabel            = StepLabel.v[Alert]
+      val organisationLabel     = StepLabel.v[Organisation]
+      val tagsLabel             = StepLabel.vs[Tag]
+      val customFieldValueLabel = StepLabel.e[AlertCustomField]
+      val customFieldLabel      = StepLabel.v[CustomField]
+      val customFieldWithValueLabel =
+        StepLabel[Seq[(AlertCustomField with Entity, CustomField with Entity)], JList[JMap[String, Any]], Converter.CList[
+          (AlertCustomField with Entity, CustomField with Entity),
+          JMap[String, Any],
+          Converter[(AlertCustomField with Entity, CustomField with Entity), JMap[String, Any]]
+        ]]
+      val caseIdLabel           = StepLabel[Seq[String], JList[AnyRef], Converter.CList[String, AnyRef, Converter[String, AnyRef]]]
+      val caseTemplateNameLabel = StepLabel[Seq[String], JList[String], Converter.CList[String, String, Converter[String, String]]]
+
+      val observableCountLabel = StepLabel[Long, JLong, Converter[Long, JLong]]
+      val result =
+        traversal
+          .`match`(
+            _.as(alertLabel)(_.out("AlertOrganisation").has("name", authContext.organisation).v[Organisation]).as(organisationLabel),
+            _.as(alertLabel)(_.out("AlertTag").v[Tag].fold).as(tagsLabel),
+            _.as(alertLabel)(
+              _.outE[AlertCustomField]
+                .e[AlertCustomField]
+                .as(customFieldValueLabel)
+                .inV
+                .v[CustomField]
+                .as(customFieldLabel)
+                .select((customFieldValueLabel, customFieldLabel))
+                .fold
+            ).as(customFieldWithValueLabel),
+            _.as(alertLabel)(_.out[AlertCase]._id.fold).as(caseIdLabel),
+            _.as(alertLabel)(_.out[AlertCaseTemplate].v[CaseTemplate].value(_.name).fold).as(caseTemplateNameLabel),
+            _.as(alertLabel)(_.outE[AlertObservable].count).as(observableCountLabel)
+          )
+          .select((alertLabel, organisationLabel, tagsLabel, customFieldWithValueLabel, caseIdLabel, caseTemplateNameLabel, observableCountLabel))
+          .domainMap {
+            case (alert, organisation, tags, customFields, caseId, caseTemplateName, observableCount) =>
+              RichAlert(
+                alert,
+                organisation.name,
+                tags,
+                customFields.map(cf => RichCustomField(cf._2, cf._1)),
+                caseId.headOption,
+                caseTemplateName.headOption,
+                observableCount
+              ) -> organisation
+          }
+      if (authContext.permissions.contains(permission))
+        result
+      else
+        result.limit(0)
+    }
 
-  def customFields: CustomFieldValueSteps =
-    new CustomFieldValueSteps(raw.outToE[AlertCustomField])
+    def customFields(name: String): Traversal.E[AlertCustomField] =
+      traversal.outE[AlertCustomField].filter(_.inV.has("name", name)).e[AlertCustomField]
 
-  def observables: ObservableSteps = new ObservableSteps(raw.outTo[AlertObservable])
+    def customFields: Traversal.E[AlertCustomField] =
+      traversal.outE[AlertCustomField].e[AlertCustomField]
 
-  def richAlertWithCustomRenderer[A](
-      entityRenderer: AlertSteps => TraversalLike[_, A]
-  )(implicit authContext: AuthContext): Traversal[(RichAlert, A), (RichAlert, A)] =
-    Traversal(
-      raw
+    def richCustomFields: Traversal[RichCustomField, JMap[String, Any], Converter[RichCustomField, JMap[String, Any]]] =
+      traversal
+        .outE[AlertCustomField]
+        .e[AlertCustomField]
+        .project(_.by.by(_.inV.v[CustomField]))
+        .domainMap {
+          case (cfv, cf) => RichCustomField(cf, cfv)
+        }
+
+    def observables: Traversal.V[Observable] = traversal.out[AlertObservable].v[Observable]
+
+    def richAlertWithCustomRenderer[D, G, C <: Converter[D, G]](
+        entityRenderer: Traversal.V[Alert] => Traversal[D, G, C]
+    ): Traversal[(RichAlert, D), JMap[String, Any], Converter[(RichAlert, D), JMap[String, Any]]] =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[AlertOrganisation].values[String]("name").fold))
-            .and(By(__[Vertex].outTo[AlertTag].fold))
-            .and(By(__[Vertex].outToE[AlertCustomField].inV().path.fold))
-            .and(By(__[Vertex].outTo[AlertCase].id().fold))
-            .and(By(__[Vertex].outTo[AlertCaseTemplate].values[String]("name").fold))
-            .and(By(__[Vertex].outToE[AlertObservable].count()))
-            .and(By(entityRenderer(newInstance(__[Vertex])).raw))
+          _.by
+            .by(_.out[AlertOrganisation].v[Organisation].value(_.name))
+            .by(_.out[AlertTag].v[Tag].fold)
+            .by(_.richCustomFields.fold)
+            .by(_.out[AlertCase]._id.fold)
+            .by(_.out[AlertCaseTemplate].v[CaseTemplate].value(_.name).fold)
+            .by(_.outE[AlertObservable].count)
+            .by(entityRenderer)
         )
-        .map {
+        .domainMap {
           case (alert, organisation, tags, customFields, caseId, caseTemplate, observableCount, renderedEntity) =>
-            val customFieldValues = (customFields: JList[Path])
-              .asScala
-              .map(_.asScala.takeRight(2).toList.asInstanceOf[List[Element]])
-              .map {
-                case List(acf, cf) => RichCustomField(cf.as[CustomField], acf.as[AlertCustomField])
-                case _             => throw InternalError("Not possible")
-              }
             RichAlert(
-              alert.as[Alert],
-              onlyOneOf[String](organisation),
-              tags.asScala.map(_.as[Tag]),
-              customFieldValues,
-              atMostOneOf[AnyRef](caseId).map(_.toString),
-              atMostOneOf[String](caseTemplate),
+              alert,
+              organisation,
+              tags,
+              customFields,
+              caseId.headOption,
+              caseTemplate.headOption,
               observableCount
             ) -> renderedEntity
         }
-    )
 
-  def richAlert: Traversal[RichAlert, RichAlert] =
-    Traversal(
-      raw
+    def richAlert: Traversal[RichAlert, JMap[String, Any], Converter[RichAlert, JMap[String, Any]]] =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[AlertOrganisation].values[String]("name").fold))
-            .and(By(__[Vertex].outTo[AlertTag].fold))
-            .and(By(__[Vertex].outToE[AlertCustomField].inV().path.fold))
-            .and(By(__[Vertex].outTo[AlertCase].id().fold))
-            .and(By(__[Vertex].outTo[AlertCaseTemplate].values[String]("name").fold))
-            .and(By(__[Vertex].outToE[AlertObservable].count()))
+          _.by
+            .by(_.out[AlertOrganisation].v[Organisation].value(_.name).fold)
+            .by(_.out[AlertTag].v[Tag].fold)
+            .by(_.richCustomFields.fold)
+            .by(_.out[AlertCase]._id.fold)
+            .by(_.out[AlertCaseTemplate].v[CaseTemplate].value(_.name).fold)
+            .by(_.outE[AlertObservable].count)
         )
-        .map {
+        .domainMap {
           case (alert, organisation, tags, customFields, caseId, caseTemplate, observableCount) =>
-            val customFieldValues = (customFields: JList[Path])
-              .asScala
-              .map(_.asScala.takeRight(2).toList.asInstanceOf[List[Element]])
-              .map {
-                case List(acf, cf) => RichCustomField(cf.as[CustomField], acf.as[AlertCustomField])
-                case _             => throw InternalError("Not possible")
-              }
             RichAlert(
-              alert.as[Alert],
-              onlyOneOf[String](organisation),
-              tags.asScala.map(_.as[Tag]),
-              customFieldValues,
-              atMostOneOf[AnyRef](caseId).map(_.toString),
-              atMostOneOf[String](caseTemplate),
+              alert,
+              organisation.head,
+              tags,
+              customFields,
+              caseId.headOption,
+              caseTemplate.headOption,
               observableCount
             )
         }
-    )
+  }
+
+  implicit class AlertCustomFieldsOpsDefs(traversal: Traversal.E[AlertCustomField]) extends CustomFieldValueOpsDefs(traversal)
 }
diff --git a/thehive/app/org/thp/thehive/services/AttachmentSrv.scala b/thehive/app/org/thp/thehive/services/AttachmentSrv.scala
index b54669fee9..ddd39f5e75 100644
--- a/thehive/app/org/thp/thehive/services/AttachmentSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AttachmentSrv.scala
@@ -7,17 +7,17 @@ import akka.NotUsed
 import akka.stream.scaladsl.{Source, StreamConverters}
 import akka.stream.{IOResult, Materializer}
 import akka.util.ByteString
-import gremlin.scala.{Graph, GremlinScala, Vertex}
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.{StorageSrv, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Hasher
 import org.thp.thehive.models.Attachment
+import org.thp.thehive.services.AttachmentOps._
 import play.api.Configuration
 
 import scala.concurrent.Future
@@ -27,12 +27,10 @@ import scala.util.Try
 class AttachmentSrv @Inject() (configuration: Configuration, storageSrv: StorageSrv)(
     implicit @Named("with-thehive-schema") db: Database,
     mat: Materializer
-) extends VertexSrv[Attachment, AttachmentSteps] {
+) extends VertexSrv[Attachment] {
 
   val hashers: Hasher = Hasher(configuration.get[Seq[String]]("attachment.hash"): _*)
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): AttachmentSteps = new AttachmentSteps(raw)
-
   def create(file: FFile)(implicit graph: Graph, authContext: AuthContext): Try[Attachment with Entity] = {
     val hs = hashers.fromPath(file.filepath)
     val id = hs.head.toString
@@ -63,9 +61,9 @@ class AttachmentSrv @Inject() (configuration: Configuration, storageSrv: Storage
     storageSrv.saveBinary("attachment", id, data).flatMap(_ => createEntity(Attachment(filename, size, contentType, hs, id)))
   }
 
-  override def get(idOrAttachmentId: String)(implicit graph: Graph): AttachmentSteps =
+  override def get(idOrAttachmentId: String)(implicit graph: Graph): Traversal.V[Attachment] =
     if (db.isValidId(idOrAttachmentId)) getByIds(idOrAttachmentId)
-    else initSteps.getByAttachmentId(idOrAttachmentId)
+    else startTraversal.getByAttachmentId(idOrAttachmentId)
 
   def source(attachment: Attachment with Entity): Source[ByteString, Future[IOResult]] =
     StreamConverters.fromInputStream(() => stream(attachment))
@@ -80,13 +78,11 @@ class AttachmentSrv @Inject() (configuration: Configuration, storageSrv: Storage
 
 }
 
-@EntitySteps[Attachment]
-class AttachmentSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[Attachment](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): AttachmentSteps = new AttachmentSteps(newRaw)
-  override def newInstance(): AttachmentSteps                             = new AttachmentSteps(raw.clone())
+object AttachmentOps {
+  implicit class AttachmentOpsDefs(traversal: Traversal.V[Attachment]) {
+    def getByAttachmentId(attachmentId: String): Traversal.V[Attachment] = traversal.has("attachmentId", attachmentId)
 
-  def getByAttachmentId(attachmentId: String): AttachmentSteps = this.has("attachmentId", attachmentId)
+    def visible(implicit authContext: AuthContext): Traversal.V[Attachment] = traversal // TODO
 
-  def visible(implicit authContext: AuthContext): AttachmentSteps = this // TODO
+  }
 }
diff --git a/thehive/app/org/thp/thehive/services/AuditSrv.scala b/thehive/app/org/thp/thehive/services/AuditSrv.scala
index 5e374071ea..46c7bb43f6 100644
--- a/thehive/app/org/thp/thehive/services/AuditSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AuditSrv.scala
@@ -1,27 +1,26 @@
 package org.thp.thehive.services
 
-import java.util.Date
+import java.util.{Map => JMap}
 
 import akka.actor.ActorRef
 import com.google.inject.name.Named
-import gremlin.scala._
 import javax.inject.{Inject, Provider, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.Order
 import org.apache.tinkerpop.gremlin.structure.Transaction.Status
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Entity, _}
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, IdentityConverter, Traversal}
 import org.thp.thehive.models._
+import org.thp.thehive.services.AuditOps._
 import org.thp.thehive.services.notification.AuditNotificationMessage
 import play.api.libs.json.{JsObject, JsValue, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.{Success, Try}
 
-case class PendingAudit(audit: Audit, context: Option[Entity], `object`: Option[Entity])
+case class PendingAudit(audit: Audit, context: Option[Product with Entity], `object`: Option[Product with Entity])
 
 @Singleton
 class AuditSrv @Inject() (
@@ -29,7 +28,7 @@ class AuditSrv @Inject() (
     @Named("notification-actor") notificationActor: ActorRef,
     eventSrv: EventSrv
 )(implicit @Named("with-thehive-schema") db: Database)
-    extends VertexSrv[Audit, AuditSteps] { auditSrv =>
+    extends VertexSrv[Audit] { auditSrv =>
   lazy val userSrv: UserSrv                               = userSrvProvider.get
   val auditUserSrv                                        = new EdgeSrv[AuditUser, Audit, User]
   val auditedSrv                                          = new EdgeSrv[Audited, Audit, Product]
@@ -57,8 +56,6 @@ class AuditSrv @Inject() (
   private var transactionAuditIds: List[(AnyRef, String)] = Nil
   private var unauditedTransactions: Set[AnyRef]          = Set.empty
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): AuditSteps = new AuditSteps(raw)
-
   /**
     * Gets the main action Audits by ids sorted by date
     * @param order the sort
@@ -66,10 +63,10 @@ class AuditSrv @Inject() (
     * @param graph db
     * @return
     */
-  def getMainByIds(order: Order, ids: String*)(implicit graph: Graph): AuditSteps =
+  def getMainByIds(order: Order, ids: String*)(implicit graph: Graph): Traversal.V[Audit] =
     getByIds(ids: _*)
       .has("mainAction", true)
-      .order(List(By(Key[Date]("_createdAt"), order)))
+      .sort(_.by("_createdAt", order))
 
   def mergeAudits[R](body: => Try[R])(auditCreator: R => Try[Unit])(implicit graph: Graph): Try[R] = {
     val tx = db.currentTransactionId(graph)
@@ -110,13 +107,13 @@ class AuditSrv @Inject() (
     }
   }
 
-  private def createFromPending(tx: AnyRef, audit: Audit, context: Option[Entity], `object`: Option[Entity])(
+  private def createFromPending(tx: AnyRef, audit: Audit, context: Option[Product with Entity], `object`: Option[Product with Entity])(
       implicit graph: Graph,
       authContext: AuthContext
   ): Try[Unit] = {
     logger.debug(s"Store audit entity: $audit")
     for {
-      user         <- userSrv.current.getOrFail()
+      user         <- userSrv.current.getOrFail("User")
       createdAudit <- createEntity(audit)
       _            <- auditUserSrv.create(AuditUser(), createdAudit, user)
       _            <- `object`.map(auditedSrv.create(Audited(), createdAudit, _)).flip
@@ -126,7 +123,10 @@ class AuditSrv @Inject() (
     }
   }
 
-  def create(audit: Audit, context: Option[Entity], `object`: Option[Entity])(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
+  def create(audit: Audit, context: Option[Product with Entity], `object`: Option[Product with Entity])(
+      implicit graph: Graph,
+      authContext: AuthContext
+  ): Try[Unit] = {
     def setupCallbacks(tx: AnyRef): Try[Unit] = {
       logger.debug("Setup callbacks for the current transaction")
       db.addTransactionListener {
@@ -157,7 +157,7 @@ class AuditSrv @Inject() (
     }
   }
 
-  def getObject(audit: Audit with Entity)(implicit graph: Graph): Option[Entity] = get(audit).`object`.headOption()
+  def getObject(audit: Audit with Entity)(implicit graph: Graph): Option[Product with Entity] = get(audit).`object`.entity.headOption
 
   class ObjectAudit[E <: Product, C <: Product] {
 
@@ -184,7 +184,7 @@ class AuditSrv @Inject() (
       if (details == JsObject.empty) Success(())
       else auditSrv.create(Audit(Audit.update, entity, Some(details.toString)), Some(entity), Some(entity))
 
-    def delete(entity: E with Entity, context: Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
+    def delete(entity: E with Entity, context: Product with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
       auditSrv.create(Audit(Audit.delete, entity, None), Some(context), None)
   }
 
@@ -272,91 +272,86 @@ class AuditSrv @Inject() (
   }
 }
 
-@EntitySteps[Audit]
-class AuditSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Audit](raw) {
-
-  def auditContextObjectOrganisation(implicit schema: Schema): Traversal[
-    (Audit with Entity, Option[Entity], Option[Entity], Option[Organisation with Entity]),
-    (Audit with Entity, Option[Entity], Option[Entity], Option[Organisation with Entity])
-  ] =
-    this
-      .project(
-        _.by
-          .by(_.context.fold)
-          .by(_.`object`.fold)
-          .by(_.organisation.fold)
-      )
-      .map {
-        case (audit, context, obj, organisation) =>
-          (
-            audit.as[Audit],
-            context.asScala.headOption.map(_.asEntity),
-            obj.asScala.headOption.map(_.asEntity),
-            organisation.asScala.headOption.map(_.as[Organisation])
-          )
-      }
-
-  def richAudit(implicit schema: Schema): Traversal[RichAudit, RichAudit] =
-    this
-      .project(
-        _.by
-          .by(_.`case`.fold)
-          .by(_.context)
-          .by(_.`object`.fold)
-      )
-      .map {
-        case (audit, context, visibilityContext, obj) =>
-          val ctx = if (context.isEmpty) visibilityContext else context.get(0)
-          RichAudit(audit.as[Audit], ctx.asEntity, visibilityContext.asEntity, atMostOneOf[Vertex](obj).map(_.asEntity))
+object AuditOps {
+
+  implicit class AuditOpsDefs(traversal: Traversal.V[Audit]) {
+
+    def auditContextObjectOrganisation
+        : Traversal[(Audit with Entity, Option[Entity], Option[Entity], Option[Organisation with Entity]), JMap[String, Any], Converter[
+          (Audit with Entity, Option[Entity], Option[Entity], Option[Organisation with Entity]),
+          JMap[String, Any]
+        ]] =
+      traversal
+        .project(
+          _.by
+            .by(_.context.entity.fold)
+            .by(_.`object`.entity.fold)
+            .by(_.organisation.v[Organisation].fold)
+        )
+        .domainMap {
+          case (audit, context, obj, organisation) => (audit, context.headOption, obj.headOption, organisation.headOption)
+        }
 
-      }
+    def richAudit: Traversal[RichAudit, JMap[String, Any], Converter[RichAudit, JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.`case`.entity.fold)
+            .by(_.context.entity)
+            .by(_.`object`.entity.fold)
+        )
+        .domainMap {
+          case (audit, context, visibilityContext, obj) =>
+            val ctx = if (context.isEmpty) visibilityContext else context.head
+            RichAudit(audit, ctx, visibilityContext, obj.headOption)
+        }
 
-  def richAuditWithCustomRenderer[A](
-      entityRenderer: AuditSteps => TraversalLike[_, A]
-  )(implicit schema: Schema): Traversal[(RichAudit, A), (RichAudit, A)] =
-    this
-      .project(
-        _.by
-          .by(_.`case`.fold)
-          .by(_.context.fold)
-          .by(_.`object`.fold)
-          .by(entityRenderer)
-      )
-      .collect {
-        case (audit, context, visibilityContext, obj, renderedObject) if !context.isEmpty || !visibilityContext.isEmpty =>
-          val ctx = if (context.isEmpty) visibilityContext.get(0) else context.get(0)
-          RichAudit(audit.as[Audit], ctx.asEntity, visibilityContext.get(0).asEntity, atMostOneOf[Vertex](obj).map(_.asEntity)) -> renderedObject
-      }
+    def richAuditWithCustomRenderer[D, G, C <: Converter[D, G]](
+        entityRenderer: Traversal.V[Audit] => Traversal[D, G, C]
+    ): Traversal[(RichAudit, D), JMap[String, Any], Converter[(RichAudit, D), JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.`case`.entity.fold)
+            .by(_.context.entity.fold)
+            .by(_.`object`.entity.fold)
+            .by(entityRenderer)
+        )
+        .domainMap {
+          case (audit, context, visibilityContext, obj, renderedObject) if context.nonEmpty || visibilityContext.nonEmpty =>
+            val ctx = if (context.isEmpty) visibilityContext.head else context.head
+            RichAudit(audit, ctx, visibilityContext.head, obj.headOption) -> renderedObject
+          // case otherwise // FIXME
+        }
 
-  def forCase(caseId: String): AuditSteps = this.filter(_.`case`.hasId(caseId))
+    def forCase(caseId: String): Traversal.V[Audit] = traversal.filter(_.`case`.hasId(caseId))
 
-  def `case`: CaseSteps =
-    new CaseSteps(
-      raw
-        .outTo[AuditContext]
+    def `case`: Traversal.V[Case] =
+      traversal
+        .out[AuditContext]
         .coalesce(_.in().hasLabel("Share"), _.hasLabel("Share"))
-        .outTo[ShareCase]
-    )
-
-  def organisation: OrganisationSteps = new OrganisationSteps(
-    raw
-      .outTo[AuditContext]
-      .coalesce(
-        _.hasLabel("Organisation"),
-        _.in().hasLabel("Share").inTo[OrganisationShare],
-        _.both().hasLabel("Organisation")
-      )
-  )
-  override def newInstance(newRaw: GremlinScala[Vertex]): AuditSteps = new AuditSteps(newRaw)
+        .out[ShareCase]
+        .v[Case]
+
+    def organisation: Traversal.V[Organisation] =
+      traversal
+        .out[AuditContext]
+        .coalesce(
+          _.hasLabel("Organisation"),
+          _.in().hasLabel("Share").in[OrganisationShare],
+          _.both().hasLabel("Organisation")
+        )
+        .v[Organisation]
 
-  def visible(implicit authContext: AuthContext): AuditSteps = visible(authContext.organisation)
+    def visible(implicit authContext: AuthContext): Traversal.V[Audit] = visible(authContext.organisation)
 
-  def visible(organisationName: String): AuditSteps = this.filter(_.organisation.has("name", organisationName))
+    def visible(organisationName: String): Traversal.V[Audit] = traversal.filter(_.organisation.has("name", organisationName))
 
-  override def newInstance(): AuditSteps = new AuditSteps(raw.clone())
+    def `object`: Traversal[Vertex, Vertex, IdentityConverter[Vertex]] = traversal.out[Audited]
 
-  def `object`: VertexSteps[_ <: Product] = new VertexSteps[Entity](raw.outTo[Audited])
+    def context: Traversal[Vertex, Vertex, IdentityConverter[Vertex]] = traversal.out[AuditContext]
+
+    //    Traversal(raw.out[AuditContext].map(_.asEntity))
+  }
 
-  def context: VertexSteps[_ <: Product] = new VertexSteps[Entity](raw.outTo[AuditContext])
-//    Traversal(raw.outTo[AuditContext].map(_.asEntity))
 }
diff --git a/thehive/app/org/thp/thehive/services/CaseSrv.scala b/thehive/app/org/thp/thehive/services/CaseSrv.scala
index 61512a2b6d..8cb6192f2d 100644
--- a/thehive/app/org/thp/thehive/services/CaseSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CaseSrv.scala
@@ -1,24 +1,28 @@
 package org.thp.thehive.services
 
-import java.util.{List => JList, Set => JSet}
+import java.util.{List => JList, Map => JMap}
 
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
-import org.apache.tinkerpop.gremlin.process.traversal.{Order, P => JP}
+import org.apache.tinkerpop.gremlin.process.traversal.{Order, P}
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.controllers.FPathElem
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
-import org.thp.scalligraph.{CreateError, EntitySteps, RichJMap, RichOptionTry, RichSeq}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.{CreateError, RichOptionTry, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.CustomFieldOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ShareOps._
 import play.api.libs.json.{JsNull, JsObject, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.{Failure, Success, Try}
 
 @Singleton
@@ -36,7 +40,7 @@ class CaseSrv @Inject() (
     impactStatusSrv: ImpactStatusSrv,
     @Named("integrity-check-actor") integrityCheckActor: ActorRef
 )(implicit @Named("with-thehive-schema") db: Database)
-    extends VertexSrv[Case, CaseSteps] {
+    extends VertexSrv[Case] {
 
   val caseTagSrv              = new EdgeSrv[CaseTag, Case, Tag]
   val caseImpactStatusSrv     = new EdgeSrv[CaseImpactStatus, Case, ImpactStatus]
@@ -63,7 +67,7 @@ class CaseSrv @Inject() (
   )(implicit graph: Graph, authContext: AuthContext): Try[RichCase] =
     for {
       createdCase <- createEntity(if (`case`.number == 0) `case`.copy(number = nextCaseNumber) else `case`)
-      assignee    <- user.fold(userSrv.current.getOrFail())(Success(_))
+      assignee    <- user.fold(userSrv.current.getOrFail("User"))(Success(_))
       _           <- caseUserSrv.create(CaseUser(), createdCase, assignee)
       _           <- shareSrv.shareCase(owner = true, createdCase, organisation, profileSrv.orgAdmin)
       _           <- caseTemplate.map(ct => caseCaseTemplateSrv.create(CaseCaseTemplate(), createdCase, ct.caseTemplate)).flip
@@ -82,14 +86,14 @@ class CaseSrv @Inject() (
       _ <- auditSrv.`case`.create(createdCase, richCase.toJson)
     } yield richCase
 
-  def nextCaseNumber(implicit graph: Graph): Int = initSteps.getLast.headOption().fold(0)(_.number) + 1
+  def nextCaseNumber(implicit graph: Graph): Int = startTraversal.getLast.headOption.fold(0)(_.number) + 1
 
-  override def exists(e: Case)(implicit graph: Graph): Boolean = initSteps.getByNumber(e.number).exists()
+  override def exists(e: Case)(implicit graph: Graph): Boolean = startTraversal.getByNumber(e.number).exists
 
   override def update(
-      steps: CaseSteps,
+      traversal: Traversal.V[Case],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(CaseSteps, JsObject)] = {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Case], JsObject)] = {
     val closeCase = PropertyUpdater(FPathElem("closeCase"), "") { (vertex, _, _, _) =>
       get(vertex)
         .tasks
@@ -108,11 +112,11 @@ class CaseSrv @Inject() (
     val isCloseCase = propertyUpdaters.exists(p => p.path.matches(FPathElem("status")) && p.value == CaseStatus.Resolved)
 
     val newPropertyUpdaters = if (isCloseCase) closeCase +: propertyUpdaters else propertyUpdaters
-    auditSrv.mergeAudits(super.update(steps, newPropertyUpdaters)) {
+    auditSrv.mergeAudits(super.update(traversal, newPropertyUpdaters)) {
       case (caseSteps, updatedFields) =>
         caseSteps
-          .newInstance()
-          .getOrFail()
+          .clone()
+          .getOrFail("Case")
           .flatMap(auditSrv.`case`.update(_, updatedFields))
     }
   }
@@ -138,7 +142,7 @@ class CaseSrv @Inject() (
   def addTags(`case`: Case with Entity, tags: Set[String])(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
     val currentTags = get(`case`)
       .tags
-      .toList
+      .toSeq
       .map(_.toString)
       .toSet
     for {
@@ -158,7 +162,7 @@ class CaseSrv @Inject() (
       .visible
       .`case`
       .hasId(`case`._id)
-      .exists() || get(`case`).observables.filter(_.hasId(richObservable.observable._id)).exists()
+      .exists || get(`case`).observables.filter(_.hasId(richObservable.observable._id)).exists
     if (alreadyExistInThatCase)
       Failure(CreateError("Observable already exists"))
     else
@@ -177,15 +181,15 @@ class CaseSrv @Inject() (
       get(`case`).remove()
     }
 
-  override def get(idOrNumber: String)(implicit graph: Graph): CaseSteps =
+  override def get(idOrNumber: String)(implicit graph: Graph): Traversal.V[Case] =
     Success(idOrNumber)
       .filter(_.headOption.contains('#'))
       .map(_.tail.toInt)
-      .map(initSteps.getByNumber(_))
+      .map(startTraversal.getByNumber(_))
       .getOrElse(super.getByIds(idOrNumber))
 
   def getCustomField(`case`: Case with Entity, customFieldName: String)(implicit graph: Graph): Option[RichCustomField] =
-    get(`case`).customFields(customFieldName).richCustomField.headOption()
+    get(`case`).customFields(customFieldName).richCustomField.headOption
 
   def updateCustomField(
       `case`: Case with Entity,
@@ -193,8 +197,7 @@ class CaseSrv @Inject() (
   )(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
     val customFieldNames = customFieldValues.map(_._1.name)
     get(`case`)
-      .customFields
-      .richCustomField
+      .richCustomFields
       .toIterator
       .filterNot(rcf => customFieldNames.contains(rcf.name))
       .foreach(rcf => get(`case`).customFields(rcf.name).remove())
@@ -208,7 +211,7 @@ class CaseSrv @Inject() (
       authContext: AuthContext
   ): Try[Unit] = {
     val cfv = get(`case`).customFields(customFieldName)
-    if (cfv.newInstance().exists())
+    if (cfv.clone().exists)
       cfv.setValue(value)
     else
       createCustomField(`case`, customFieldName, value, order).map(_ => ())
@@ -226,8 +229,6 @@ class CaseSrv @Inject() (
       ccfe <- caseCustomFieldSrv.create(ccf, `case`, cf)
     } yield RichCustomField(cf, ccfe)
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): CaseSteps = new CaseSteps(raw)
-
   def setImpactStatus(
       `case`: Case with Entity,
       impactStatus: String
@@ -330,247 +331,245 @@ class CaseSrv @Inject() (
 //      .flatMap(_.observables.toList
 //      .foreach(observable ⇒ observableCaseSrv.create(ObservableCase(), observable, mergedCase))
 //
-//    get(mergedCase).richCase.head()
+//    get(mergedCase).richCase.head
 //  }
 }
 
-@EntitySteps[Case]
-class CaseSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Case](raw) {
-  def resolutionStatus: ResolutionStatusSteps = new ResolutionStatusSteps(raw.outTo[CaseResolutionStatus])
+object CaseOps {
 
-  def get(id: String): CaseSteps =
-    Success(id)
-      .filter(_.headOption.contains('#'))
-      .map(_.tail.toInt)
-      .map(getByNumber)
-      .getOrElse(this.getByIds(id))
+  implicit class CaseOpsDefs(traversal: Traversal.V[Case]) {
 
-  def getByNumber(caseNumber: Int): CaseSteps = newInstance(raw.has(Key("number") of caseNumber))
+    def resolutionStatus: Traversal.V[ResolutionStatus] = traversal.out[CaseResolutionStatus].v[ResolutionStatus]
 
-  def visible(implicit authContext: AuthContext): CaseSteps = visible(authContext.organisation)
+    def get(id: String): Traversal.V[Case] =
+      Success(id)
+        .filter(_.headOption.contains('#'))
+        .map(_.tail.toInt)
+        .map(getByNumber)
+        .getOrElse(traversal.getByIds(id))
 
-  def visible(organisationName: String): CaseSteps =
-    this.filter(_.inTo[ShareCase].inTo[OrganisationShare].has("name", organisationName))
+    def getByNumber(caseNumber: Int): Traversal.V[Case] = traversal.has("number", caseNumber)
 
-  def assignee: UserSteps = new UserSteps(raw.outTo[CaseUser])
+    def visible(implicit authContext: AuthContext): Traversal.V[Case] = visible(authContext.organisation)
 
-  def can(permission: Permission)(implicit authContext: AuthContext): CaseSteps =
-    if (authContext.permissions.contains(permission))
-      this.filter(
-        _.inTo[ShareCase]
-          .filter(_.outTo[ShareProfile].has("permissions", permission))
-          .inTo[OrganisationShare]
-          .has("name", authContext.organisation)
-      )
-    else
-      this.limit(0)
-
-  override def newInstance(newRaw: GremlinScala[Vertex]): CaseSteps = new CaseSteps(newRaw)
-
-  override def newInstance(): CaseSteps = new CaseSteps(raw.clone())
-
-  def getLast: CaseSteps =
-    newInstance(raw.order(By(Key[Int]("number"), Order.desc)))
-
-  def richCaseWithCustomRenderer[A](
-      entityRenderer: CaseSteps => TraversalLike[_, A]
-  )(implicit authContext: AuthContext): Traversal[(RichCase, A), (RichCase, A)] =
-    this
-      .project(
-        _.by
-          .by(_.tags.fold)
-          .by(_.impactStatus.value.fold)
-          .by(_.resolutionStatus.value.fold)
-          .by(_.assignee.login.fold)
-          .by(_.richCustomFields.fold)
-          .by(entityRenderer)
-          .by(_.userPermissions)
-      )
-      .map {
-        case (caze, tags, impactStatus, resolutionStatus, user, customFields, renderedEntity, userPermissions) =>
-          RichCase(
-            caze.as[Case],
-            tags.asScala.map(_.as[Tag]),
-            atMostOneOf[String](impactStatus),
-            atMostOneOf[String](resolutionStatus),
-            atMostOneOf[String](user),
-            customFields.asScala,
-            userPermissions
-          ) -> renderedEntity
-      }
+    def visible(organisationName: String): Traversal.V[Case] =
+      traversal.filter(_.in[ShareCase].in[OrganisationShare].has("name", organisationName))
 
-  def customFields(name: String): CustomFieldValueSteps =
-    new CustomFieldValueSteps(raw.outToE[CaseCustomField].filter(_.inV().has(Key("name") of name)))
+    def assignee: Traversal.V[User] = traversal.out[CaseUser].v[User]
 
-  def customFields: CustomFieldValueSteps =
-    new CustomFieldValueSteps(raw.outToE[CaseCustomField])
+    def can(permission: Permission)(implicit authContext: AuthContext): Traversal.V[Case] =
+      if (authContext.permissions.contains(permission))
+        traversal.filter(
+          _.in[ShareCase]
+            .filter(_.out[ShareProfile].has("permissions", permission))
+            .in[OrganisationShare]
+            .has("name", authContext.organisation)
+        )
+      else
+        traversal.limit(0)
+
+    def getLast: Traversal.V[Case] =
+      traversal.sort(_.by("number", Order.desc))
+
+    def richCaseWithCustomRenderer[D, G, C <: Converter[D, G]](
+        entityRenderer: Traversal.V[Case] => Traversal[D, G, C]
+    )(implicit authContext: AuthContext) =
+      traversal
+        .project(
+          _.by
+            .by(_.tags.v[Tag].fold)
+            .by(_.impactStatus.value(_.value).fold)
+            .by(_.resolutionStatus.value(_.value).fold)
+            .by(_.assignee.value(_.login).fold)
+            .by(_.richCustomFields.fold)
+            .by(entityRenderer)
+            .by(_.userPermissions)
+        )
+        .domainMap {
+          case (caze, tags, impactStatus, resolutionStatus, user, customFields, renderedEntity, userPermissions) =>
+            RichCase(
+              caze,
+              tags,
+              impactStatus.headOption,
+              resolutionStatus.headOption,
+              user.headOption,
+              customFields,
+              userPermissions
+            ) -> renderedEntity
+        }
 
-  def richCustomFields: Traversal[RichCustomField, RichCustomField] =
-    this.outToE[CaseCustomField].project(_.by.by(_.inV())).map {
-      case (cfv, cf) => RichCustomField(cf.as[CustomField], cfv.as[CaseCustomField])
-    }
+    def customFields(name: String): Traversal.E[CaseCustomField] =
+      traversal.outE[CaseCustomField].filter(_.inV.has("name", name)).e[CaseCustomField]
 
-  def share(implicit authContext: AuthContext): ShareSteps = share(authContext.organisation)
+    def customFields: Traversal.E[CaseCustomField] =
+      traversal.outE[CaseCustomField].e[CaseCustomField]
 
-  def share(organisationName: String): ShareSteps =
-    new ShareSteps(
-      this.inTo[ShareCase].filter(_.inTo[OrganisationShare].has("name", organisationName)).raw
-    )
+    def richCustomFields: Traversal[RichCustomField, JMap[String, Any], Converter[RichCustomField, JMap[String, Any]]] =
+      traversal
+        .outE[CaseCustomField]
+        .e[CaseCustomField]
+        .project(_.by.by(_.inV.v[CustomField]))
+        .domainMap {
+          case (cfv, cf) => RichCustomField(cf, cfv)
+        }
 
-  def shares: ShareSteps = new ShareSteps(raw.inTo[ShareCase])
+    def share(implicit authContext: AuthContext): Traversal.V[Share] = share(authContext.organisation)
 
-  def organisations: OrganisationSteps = new OrganisationSteps(raw.inTo[ShareCase].inTo[OrganisationShare])
+    def share(organisationName: String): Traversal.V[Share] =
+      traversal.in[ShareCase].filter(_.in[OrganisationShare].has("name", organisationName)).v[Share]
 
-  def organisations(permission: Permission) =
-    new OrganisationSteps(raw.inTo[ShareCase].filter(_.outTo[ShareProfile].has(Key("permissions") of permission)).inTo[OrganisationShare])
+    def shares: Traversal.V[Share] = traversal.in[ShareCase].v[Share]
 
-  def userPermissions(implicit authContext: AuthContext): Traversal[Set[Permission], Set[Permission]] =
-    this
-      .share(authContext.organisation)
-      .profile
-      .map(profile => profile.permissions & authContext.permissions)
+    def organisations: Traversal.V[Organisation] = traversal.in[ShareCase].in[OrganisationShare].v[Organisation]
 
-  def origin: OrganisationSteps = new OrganisationSteps(raw.inTo[ShareCase].has(Key("owner") of true).inTo[OrganisationShare])
+    def organisations(permission: Permission): Traversal.V[Organisation] =
+      traversal.in[ShareCase].filter(_.out[ShareProfile].has("permissions", permission)).in[OrganisationShare].v[Organisation]
 
-  def audits(implicit authContext: AuthContext): AuditSteps = audits(authContext.organisation)
+    def userPermissions(implicit authContext: AuthContext): Traversal[Set[Permission], Vertex, Converter[Set[Permission], Vertex]] =
+      traversal
+        .share(authContext.organisation)
+        .profile
+        .domainMap(profile => profile.permissions & authContext.permissions)
 
-  def audits(organisationName: String): AuditSteps = new AuditSteps(
-    this
-      .union(_.visible(organisationName), _.observables(organisationName), _.tasks(organisationName), _.share(organisationName))
-      .inTo[AuditContext]
-      .raw
-  )
+    def origin: Traversal.V[Organisation] = traversal.in[ShareCase].has("owner", true).in[OrganisationShare].v[Organisation]
 
-  // Warning: this method doesn't generate audit log
-  def unassign(): Unit = {
-    raw.outToE[CaseUser].drop().iterate()
-    ()
-  }
+    def audits(implicit authContext: AuthContext): Traversal.V[Audit] = audits(authContext.organisation)
 
-  def unsetResolutionStatus(): Unit = {
-    raw.outToE[CaseResolutionStatus].drop().iterate()
-    ()
-  }
+    def audits(organisationName: String): Traversal.V[Audit] =
+      traversal
+        .unionFlat(_.visible(organisationName), _.observables(organisationName), _.tasks(organisationName), _.share(organisationName))
+        .in[AuditContext]
+        .v[Audit]
 
-  def unsetImpactStatus(): Unit = {
-    raw.outToE[CaseImpactStatus].drop().iterate()
-    ()
-  }
+    // Warning: this method doesn't generate audit log
+    def unassign(): Unit =
+      traversal.outE[CaseUser].remove()
+
+    def unsetResolutionStatus(): Unit =
+      traversal.outE[CaseResolutionStatus].remove()
 
-  def removeTags(tags: Set[Tag with Entity]): Unit =
-    if (tags.nonEmpty)
-      this.outToE[CaseTag].filter(_.otherV().hasId(tags.map(_._id).toSeq: _*)).remove()
+    def unsetImpactStatus(): Unit =
+      traversal.outE[CaseImpactStatus].remove()
 
-  def linkedCases(implicit authContext: AuthContext): Seq[(RichCase, Seq[RichObservable])] = {
-    val originCaseLabel = StepLabel[JSet[Vertex]]()
-    val observableLabel = StepLabel[Vertex]()
-    val linkedCaseLabel = StepLabel[Vertex]()
+    def removeTags(tags: Set[Tag with Entity]): Unit =
+      if (tags.nonEmpty)
+        traversal.outE[CaseTag].filter(_.otherV.hasId(tags.map(_._id).toSeq: _*)).remove()
 
-    val richCaseLabel        = StepLabel[RichCase]()
-    val richObservablesLabel = StepLabel[JList[RichObservable]]()
-    Traversal(
-      raw
+    def linkedCases(implicit authContext: AuthContext): Seq[(RichCase, Seq[RichObservable])] = {
+      val originCaseLabel = StepLabel.v[Case]
+      val observableLabel = StepLabel.v[Observable]
+      val linkedCaseLabel = StepLabel.v[Case]
+
+      val richCaseLabel = StepLabel[RichCase, JMap[String, Any], Converter[RichCase, JMap[String, Any]]]
+      val richObservablesLabel =
+        StepLabel[Seq[RichObservable], JList[JMap[String, Any]], Converter.CList[RichObservable, JMap[String, Any], Converter[
+          RichObservable,
+          JMap[String, Any]
+        ]]]
+      traversal
         .`match`(
-          _.as(originCaseLabel.name)
-            .in("ShareCase")
-            .filter(
-              _.inTo[OrganisationShare]
-                .has(Key("name") of authContext.organisation)
-            )
-            .out("ShareObservable")
-            .as(observableLabel.name),
-          _.as(observableLabel.name)
-            .out("ObservableData")
-            .in("ObservableData")
-            .in("ShareObservable")
-            .filter(
-              _.inTo[OrganisationShare]
-                .has(Key("name") of authContext.organisation)
-            )
-            .out("ShareCase")
-            .where(JP.neq(originCaseLabel.name))
-            .as(linkedCaseLabel.name),
-          c => new CaseSteps(c.as(linkedCaseLabel)).richCase.as(richCaseLabel).raw,
-          o => new ObservableSteps(o.as(observableLabel)).richObservable.fold.as(richObservablesLabel).raw
+          _.as(originCaseLabel)(
+            _.in[ShareCase]
+              .filter(
+                _.in[OrganisationShare]
+                  .has("name", authContext.organisation)
+              )
+              .out[ShareObservable]
+              .v[Observable]
+          ).as(observableLabel),
+          _.as(observableLabel)(
+            _.out[ObservableData]
+              .in[ObservableData]
+              .in[ShareObservable]
+              .filter(
+                _.in[OrganisationShare]
+                  .has("name", authContext.organisation)
+              )
+              .out("ShareCase")
+              .where(P.neq(originCaseLabel.name))
+              .v[Case]
+          ).as(linkedCaseLabel),
+          _.as(linkedCaseLabel)(_.richCase).as(richCaseLabel),
+          _.as(observableLabel)(_.richObservable.fold).as(richObservablesLabel)
         )
-        .dedup(richCaseLabel.name)
-        .select(richCaseLabel.name, richObservablesLabel.name)
-    ).toList
-      .map { resultMap =>
-        resultMap.getValue(richCaseLabel) -> resultMap.getValue(richObservablesLabel).asScala
-      }
-  }
+        .dedup(richCaseLabel)
+        .select((richCaseLabel, richObservablesLabel))
+        .toSeq
+    }
 
-  def richCase(implicit authContext: AuthContext): Traversal[RichCase, RichCase] =
-    this
-      .project(
-        _.by
-          .by(_.tags.fold)
-          .by(_.impactStatus.value.fold)
-          .by(_.resolutionStatus.value.fold)
-          .by(_.assignee.login.fold)
-          .by(_.richCustomFields.fold)
-          .by(_.userPermissions)
-      )
-      .map {
-        case (caze, tags, impactStatus, resolutionStatus, user, customFields, userPermissions) =>
-          RichCase(
-            caze.as[Case],
-            tags.asScala.map(_.as[Tag]),
-            atMostOneOf[String](impactStatus),
-            atMostOneOf[String](resolutionStatus),
-            atMostOneOf[String](user),
-            customFields.asScala,
-            userPermissions
-          )
-      }
+    def richCase(implicit authContext: AuthContext): Traversal[RichCase, JMap[String, Any], Converter[RichCase, JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.tags.v[Tag].fold)
+            .by(_.impactStatus.value(_.value).fold)
+            .by(_.resolutionStatus.value(_.value).fold)
+            .by(_.assignee.value(_.login).fold)
+            .by(_.richCustomFields.fold)
+            .by(_.userPermissions)
+        )
+        .domainMap {
+          case (caze, tags, impactStatus, resolutionStatus, user, customFields, userPermissions) =>
+            RichCase(
+              caze,
+              tags,
+              impactStatus.headOption,
+              resolutionStatus.headOption,
+              user.headOption,
+              customFields,
+              userPermissions
+            )
+        }
 
-  def user: UserSteps = new UserSteps(raw.outTo[CaseUser])
-
-  def richCaseWithoutPerms: Traversal[RichCase, RichCase] =
-    this
-      .project(
-        _.by
-          .by(_.tags.fold)
-          .by(_.impactStatus.value.fold)
-          .by(_.resolutionStatus.value.fold)
-          .by(_.assignee.login.fold)
-          .by(_.richCustomFields.fold)
-      )
-      .map {
-        case (caze, tags, impactStatus, resolutionStatus, user, customFields) =>
-          RichCase(
-            caze.as[Case],
-            tags.asScala.map(_.as[Tag]),
-            atMostOneOf[String](impactStatus),
-            atMostOneOf[String](resolutionStatus),
-            atMostOneOf[String](user),
-            customFields.asScala,
-            Set.empty
-          )
-      }
+    def user: Traversal.V[User] = traversal.out[CaseUser].v[User]
+
+    def richCaseWithoutPerms: Traversal[RichCase, JMap[String, Any], Converter[RichCase, JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.tags.fold)
+            .by(_.impactStatus.value(_.value).fold)
+            .by(_.resolutionStatus.value(_.value).fold)
+            .by(_.assignee.value(_.login).fold)
+            .by(_.richCustomFields.fold)
+        )
+        .domainMap {
+          case (caze, tags, impactStatus, resolutionStatus, user, customFields) =>
+            RichCase(
+              caze,
+              tags,
+              impactStatus.headOption,
+              resolutionStatus.headOption,
+              user.headOption,
+              customFields,
+              Set.empty
+            )
+        }
 
-  def tags: TagSteps = new TagSteps(raw.outTo[CaseTag])
+    def tags: Traversal.V[Tag] = traversal.out[CaseTag].v[Tag]
 
-  def impactStatus: ImpactStatusSteps = new ImpactStatusSteps(raw.outTo[CaseImpactStatus])
+    def impactStatus: Traversal.V[ImpactStatus] = traversal.out[CaseImpactStatus].v[ImpactStatus]
 
-  def tasks(implicit authContext: AuthContext): TaskSteps = tasks(authContext.organisation)
+    def tasks(implicit authContext: AuthContext): Traversal.V[Task] = tasks(authContext.organisation)
 
-  def tasks(organisationName: String): TaskSteps =
-    share(organisationName).tasks
+    def tasks(organisationName: String): Traversal.V[Task] =
+      share(organisationName).tasks
 
-  def observables(implicit authContext: AuthContext): ObservableSteps = observables(authContext.organisation)
+    def observables(implicit authContext: AuthContext): Traversal.V[Observable] = observables(authContext.organisation)
 
-  def observables(organisationName: String): ObservableSteps =
-    share(organisationName).observables
+    def observables(organisationName: String): Traversal.V[Observable] =
+      share(organisationName).observables
 
-  def assignableUsers(implicit authContext: AuthContext): UserSteps =
-    organisations(Permissions.manageCase)
-      .visible
-      .users(Permissions.manageCase)
-      .dedup
+    def assignableUsers(implicit authContext: AuthContext): Traversal.V[User] =
+      organisations(Permissions.manageCase)
+        .visible
+        .users(Permissions.manageCase)
+        .dedup
+
+    def alert: Traversal.V[Alert] = traversal.in[AlertCase].v[Alert]
+  }
 
-  def alert: AlertSteps = new AlertSteps(raw.inTo[AlertCase])
+//  implicit class CaseCustomFieldsOpsDefs(traversal: Traversal.E[CaseCustomField]) extends CustomFieldValueOpsDefs(traversal)
 }
 
 class CaseIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: CaseSrv) extends IntegrityCheckOps[Case] {
@@ -581,15 +580,16 @@ class CaseIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Dat
           resolve(entities)
         }
       }
-  override def resolve(entities: List[Case with Entity])(implicit graph: Graph): Try[Unit] = {
+
+  override def resolve(entities: Seq[Case with Entity])(implicit graph: Graph): Try[Unit] = {
     val nextNumber = service.nextCaseNumber
     firstCreatedEntity(entities).foreach(
       _._2
-        .flatMap(service.get(_).raw.headOption())
+        .flatMap(service.get(_).setConverter[Vertex, Converter.Identity[Vertex]](Converter.identity).headOption)
         .zipWithIndex
         .foreach {
           case (vertex, index) =>
-            db.setSingleProperty(vertex, "number", nextNumber + index, UniMapping.int)
+            UMapping.int.setProperty(vertex, "number", nextNumber + index)
         }
     )
     Success(())
diff --git a/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala b/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
index 0166f69f8f..956c48942a 100644
--- a/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
@@ -1,24 +1,26 @@
 package org.thp.thehive.services
 
-import java.util.{Collection => JCollection, List => JList, Map => JMap}
+import java.util.{Map => JMap}
 
 import akka.actor.ActorRef
-import gremlin.scala.{__, By, Element, Graph, GremlinScala, Key, P, Vertex}
 import javax.inject.{Inject, Named}
-import org.apache.tinkerpop.gremlin.process.traversal.{Path, Scope}
-import org.apache.tinkerpop.gremlin.structure.T
+import org.apache.tinkerpop.gremlin.process.traversal.P
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
-import org.thp.scalligraph.{CreateError, EntitySteps, InternalError, RichSeq}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.{CreateError, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.CustomFieldOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.TaskOps._
 import play.api.libs.json.{JsObject, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.{Failure, Success, Try}
 
 class CaseTemplateSrv @Inject() (
@@ -29,18 +31,16 @@ class CaseTemplateSrv @Inject() (
     auditSrv: AuditSrv,
     @Named("integrity-check-actor") integrityCheckActor: ActorRef
 )(implicit @Named("with-thehive-schema") db: Database)
-    extends VertexSrv[CaseTemplate, CaseTemplateSteps] {
+    extends VertexSrv[CaseTemplate] {
 
   val caseTemplateTagSrv          = new EdgeSrv[CaseTemplateTag, CaseTemplate, Tag]
   val caseTemplateCustomFieldSrv  = new EdgeSrv[CaseTemplateCustomField, CaseTemplate, CustomField]
   val caseTemplateOrganisationSrv = new EdgeSrv[CaseTemplateOrganisation, CaseTemplate, Organisation]
   val caseTemplateTaskSrv         = new EdgeSrv[CaseTemplateTask, CaseTemplate, Task]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): CaseTemplateSteps = new CaseTemplateSteps(raw)
-
-  override def get(idOrName: String)(implicit graph: Graph): CaseTemplateSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[CaseTemplate] =
     if (db.isValidId(idOrName)) super.getByIds(idOrName)
-    else initSteps.getByName(idOrName)
+    else startTraversal.getByName(idOrName)
 
   override def createEntity(e: CaseTemplate)(implicit graph: Graph, authContext: AuthContext): Try[CaseTemplate with Entity] = {
     integrityCheckActor ! IntegrityCheckActor.EntityAdded("CaseTemplate")
@@ -68,7 +68,7 @@ class CaseTemplateSrv @Inject() (
       implicit graph: Graph,
       authContext: AuthContext
   ): Try[RichCaseTemplate] =
-    if (organisationSrv.get(organisation).caseTemplates.has("name", P.eq[String](caseTemplate.name)).exists())
+    if (organisationSrv.get(organisation).caseTemplates.has("name", P.eq[String](caseTemplate.name)).exists)
       Failure(CreateError(s"""The case template "${caseTemplate.name}" already exists"""))
     else
       for {
@@ -92,14 +92,14 @@ class CaseTemplateSrv @Inject() (
     } yield ()
 
   override def update(
-      steps: CaseTemplateSteps,
+      traversal: Traversal.V[CaseTemplate],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(CaseTemplateSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[CaseTemplate], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (templateSteps, updatedFields) =>
         templateSteps
-          .newInstance()
-          .getOrFail()
+          .clone()
+          .getOrFail("CaseTemplate")
           .flatMap(auditSrv.caseTemplate.update(_, updatedFields))
     }
 
@@ -124,7 +124,7 @@ class CaseTemplateSrv @Inject() (
   def addTags(caseTemplate: CaseTemplate with Entity, tags: Set[String])(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
     val currentTags = get(caseTemplate)
       .tags
-      .toList
+      .toSeq
       .map(_.toString)
       .toSet
     for {
@@ -135,7 +135,7 @@ class CaseTemplateSrv @Inject() (
   }
 
   def getCustomField(caseTemplate: CaseTemplate with Entity, customFieldName: String)(implicit graph: Graph): Option[RichCustomField] =
-    get(caseTemplate).customFields(customFieldName).richCustomField.headOption()
+    get(caseTemplate).customFields(customFieldName).richCustomField.headOption
 
   def updateCustomField(
       caseTemplate: CaseTemplate with Entity,
@@ -159,7 +159,7 @@ class CaseTemplateSrv @Inject() (
       authContext: AuthContext
   ): Try[Unit] = {
     val cfv = get(caseTemplate).customFields(customFieldName)
-    if (cfv.newInstance().exists())
+    if (cfv.clone().exists)
       cfv.setValue(value)
     else
       createCustomField(caseTemplate, customFieldName, value, order).map(_ => ())
@@ -178,76 +178,77 @@ class CaseTemplateSrv @Inject() (
     } yield RichCustomField(cf, ccfe)
 }
 
-@EntitySteps[CaseTemplate]
-class CaseTemplateSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[CaseTemplate](raw) {
-
-  def get(idOrName: String): CaseTemplateSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
-
-  def getByName(name: String): CaseTemplateSteps = newInstance(raw.has(Key("name") of name))
+object CaseTemplateOps {
+  implicit class CaseTemplateOpsDefs(traversal: Traversal.V[CaseTemplate]) {
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): CaseTemplateSteps = new CaseTemplateSteps(newRaw)
+    def get(idOrName: String)(implicit db: Database): Traversal.V[CaseTemplate] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
-  def visible(implicit authContext: AuthContext): CaseTemplateSteps =
-    this.filter(_.outTo[CaseTemplateOrganisation].has("name", authContext.organisation))
+    def getByName(name: String): Traversal.V[CaseTemplate] = traversal.has("name", name)
 
-  override def newInstance(): CaseTemplateSteps = new CaseTemplateSteps(raw.clone())
+    def visible(implicit authContext: AuthContext): Traversal.V[CaseTemplate] =
+      traversal.filter(_.out[CaseTemplateOrganisation].has("name", authContext.organisation))
 
-  def can(permission: Permission)(implicit authContext: AuthContext): CaseTemplateSteps =
-    if (authContext.permissions.contains(permission))
-      this.filter(
-        _.outTo[CaseTemplateOrganisation]
-          .has("name", authContext.organisation)
-      )
-    else
-      this.limit(0)
+    def can(permission: Permission)(implicit authContext: AuthContext): Traversal.V[CaseTemplate] =
+      if (authContext.permissions.contains(permission))
+        traversal.filter(
+          _.out[CaseTemplateOrganisation]
+            .has("name", authContext.organisation)
+        )
+      else
+        traversal.limit(0)
 
-  def richCaseTemplate: Traversal[RichCaseTemplate, RichCaseTemplate] =
-    Traversal(
-      raw
+    def richCaseTemplate: Traversal[RichCaseTemplate, JMap[String, Any], Converter[RichCaseTemplate, JMap[String, Any]]] = {
+      val caseTemplateCustomFieldLabel = StepLabel.e[CaseTemplateCustomField]
+      val customFieldLabel             = StepLabel.v[CustomField]
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[CaseTemplateOrganisation].values[String]("name").fold))
-            .and(By(__[Vertex].outTo[CaseTemplateTag].fold))
-            .and(By(new TaskSteps(__[Vertex].outTo[CaseTemplateTask]).richTask.raw.fold))
-            .and(By(__[Vertex].outToE[CaseTemplateCustomField].inV().path.fold.traversal))
+          _.by
+            .by(_.out[CaseTemplateOrganisation].v[Organisation].value(_.name))
+            .by(_.out[CaseTemplateTag].v[Tag].fold)
+            .by(_.out[CaseTemplateTask].v[Task].richTask.fold)
+            .by(
+              _.outE[CaseTemplateCustomField]
+                .e[CaseTemplateCustomField]
+                .as(caseTemplateCustomFieldLabel)
+                .inV
+                .v[CustomField]
+                .as(customFieldLabel)
+                .select((caseTemplateCustomFieldLabel, customFieldLabel))
+                .fold
+            )
         )
-        .map {
+        .domainMap {
           case (caseTemplate, organisation, tags, tasks, customFields) =>
-            val customFieldValues = (customFields: JList[Path])
-              .asScala
-              .map(_.asScala.takeRight(2).toList.asInstanceOf[List[Element]])
-              .map {
-                case List(ccf, cf) => RichCustomField(cf.as[CustomField], ccf.as[CaseCustomField])
-                case _             => throw InternalError("Not possible")
-              }
             RichCaseTemplate(
-              caseTemplate.as[CaseTemplate],
-              onlyOneOf[String](organisation),
-              tags.asScala.map(_.as[Tag]),
-              tasks.asScala,
-              customFieldValues
+              caseTemplate,
+              organisation,
+              tags,
+              tasks,
+              customFields.map(cf => RichCustomField(cf._2, cf._1))
             )
         }
-    )
+    }
 
-  def organisation = new OrganisationSteps(raw.outTo[CaseTemplateOrganisation])
+    def organisation = traversal.out[CaseTemplateOrganisation].v[Organisation]
 
-  def tasks = new TaskSteps(raw.outTo[CaseTemplateTask])
+    def tasks = traversal.out[CaseTemplateTask].v[Task]
 
-  def tags: TagSteps = new TagSteps(raw.outTo[CaseTemplateTag])
+    def tags: Traversal.V[Tag] = traversal.out[CaseTemplateTag].v[Tag]
 
-  def removeTags(tags: Set[Tag with Entity]): Unit =
-    if (tags.nonEmpty)
-      this.outToE[CaseTemplateTag].filter(_.inV().hasId(tags.map(_._id).toSeq: _*)).remove()
+    def removeTags(tags: Set[Tag with Entity]): Unit =
+      if (tags.nonEmpty)
+        traversal.outE[CaseTemplateTag].filter(_.inV.hasId(tags.map(_._id).toSeq: _*)).remove()
 
-  def customFields(name: String): CustomFieldValueSteps =
-    new CustomFieldValueSteps(raw.outToE[CaseTemplateCustomField].filter(_.inV().has(Key("name") of name)))
+    def customFields(name: String): Traversal.E[CaseTemplateCustomField] =
+      traversal.outE[CaseTemplateCustomField].filter(_.inV.has("name", name)).e[CaseTemplateCustomField]
+
+    def customFields: Traversal.E[CaseTemplateCustomField] =
+      traversal.outE[CaseTemplateCustomField].e[CaseTemplateCustomField]
+  }
 
-  def customFields: CustomFieldValueSteps =
-    new CustomFieldValueSteps(raw.outToE[CaseTemplateCustomField])
+  implicit class CaseTemplateCustomFieldsOpsDefs(traversal: Traversal.E[CaseTemplateCustomField]) extends CustomFieldValueOpsDefs(traversal)
 }
 
 class CaseTemplateIntegrityCheckOps @Inject() (
@@ -255,26 +256,24 @@ class CaseTemplateIntegrityCheckOps @Inject() (
     val service: CaseTemplateSrv,
     organisationSrv: OrganisationSrv
 ) extends IntegrityCheckOps[CaseTemplate] {
-  override def duplicateEntities: List[List[CaseTemplate with Entity]] =
+  override def duplicateEntities: Seq[Seq[CaseTemplate with Entity]] =
     db.roTransaction { implicit graph =>
       organisationSrv
-        .initSteps
-        .raw
-        .traversal
+        .startTraversal
         .flatMap(
-          __.in("CaseTemplateOrganisation")
-            .group(By(Key[String]("name")), By(T.id))
-            .unfold[JMap.Entry[String, JCollection[Any]]]()
+          _.in[CaseTemplateOrganisation]
+            .v[Organisation]
+            .group(_.byValue(_.name), _.by(_._id.fold))
+            .unfold
             .selectValues
-            .where(_.count(Scope.local).is(P.gt(1)))
+            .where(_.localCount.is(P.gt(1)))
             .traversal
         )
-        .asScala
-        .map(ids => service.getByIds(ids.asScala.map(_.toString).toSeq: _*).toList)
-        .toList
+        .domainMap(ids => service.getByIds(ids: _*).toSeq)
+        .toSeq
     }
 
-  override def resolve(entities: List[CaseTemplate with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[CaseTemplate with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head, e => e.label() == "CaseCaseTemplate" || e.label() == "AlertCaseTemplate"))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/ConfigSrv.scala b/thehive/app/org/thp/thehive/services/ConfigSrv.scala
index 5932cd1068..cbbb3372f0 100644
--- a/thehive/app/org/thp/thehive/services/ConfigSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ConfigSrv.scala
@@ -1,20 +1,21 @@
 package org.thp.thehive.services
 
-import gremlin.scala.{Graph, GremlinScala, Key, P, Vertex}
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.process.traversal.P
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.{EdgeSrv, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
 import org.thp.thehive.models._
+import org.thp.thehive.services.ConfigOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services.notification.NotificationSrv
 import org.thp.thehive.services.notification.triggers.Trigger
 import play.api.libs.json.{JsValue, Reads}
-import shapeless.HNil
 
-import scala.collection.JavaConverters._
 import scala.util.Try
 
 @Singleton
@@ -22,20 +23,18 @@ class ConfigSrv @Inject() (
     organisationSrv: OrganisationSrv,
     userSrv: UserSrv
 )(@Named("with-thehive-schema") implicit val db: Database)
-    extends VertexSrv[Config, ConfigSteps] {
+    extends VertexSrv[Config] {
   val organisationConfigSrv = new EdgeSrv[OrganisationConfig, Organisation, Config]
   val userConfigSrv         = new EdgeSrv[UserConfig, User, Config]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ConfigSteps = new ConfigSteps(raw)
-
   def triggerMap(notificationSrv: NotificationSrv)(implicit graph: Graph): Map[String, Map[Trigger, (Boolean, Seq[String])]] =
-    initSteps.triggerMap(notificationSrv)
+    startTraversal.triggerMap(notificationSrv)
 
   object organisation {
 
     def setConfigValue(organisationName: String, name: String, value: JsValue)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
       getConfigValue(organisationName, name) match {
-        case Some(config) => get(config).update("value" -> value).map(_ => ())
+        case Some(config) => get(config).update(_.value, value).domainMap(_ => ()).getOrFail("Config")
         case None =>
           for {
             createdConfig <- createEntity(Config(name, value))
@@ -49,14 +48,14 @@ class ConfigSrv @Inject() (
         .get(organisationName)
         .config
         .has("name", name)
-        .headOption()
+        .headOption
   }
 
   object user {
 
     def setConfigValue(userName: String, name: String, value: JsValue)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
       getConfigValue(userName, name) match {
-        case Some(config) => get(config).update("value" -> value).map(_ => ())
+        case Some(config) => get(config).update(_.value, value).domainMap(_ => ()).getOrFail("Config")
         case None =>
           for {
             createdConfig <- createEntity(Config(name, value))
@@ -70,68 +69,74 @@ class ConfigSrv @Inject() (
         .get(userName)
         .config
         .has("name", name)
-        .headOption()
+        .headOption
   }
 }
 
-@EntitySteps[Config]
-class ConfigSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Config](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): ConfigSteps = new ConfigSteps(newRaw)
-  override def newInstance(): ConfigSteps                             = new ConfigSteps(raw.clone())
-
-  def triggerMap(notificationSrv: NotificationSrv): Map[String, Map[Trigger, (Boolean, Seq[String])]] = {
-
-    // Traversal of configuration version of type "notification"
-    def notificationRaw: GremlinScala.Aux[Vertex, HNil] =
-      raw
-        .clone()
-        .has(Key[String]("name"), P.eq[String]("notification"))
-        .asInstanceOf[GremlinScala.Aux[Vertex, HNil]]
-
-    // Retrieve triggers configured for each organisation
-    val organisationTriggers: Iterator[(String, Trigger, Option[String])] = for {
-      (notifConfig, orgId) <- notificationRaw
-        .as("config")
-        .in("OrganisationConfig")
-        .id()
-        .as("orgId")
-        .select
-        .traversal
-        .asScala
-//      cfg     <- notificationSrv.getConfig(notifConfig.value[String]("value"))
-//      trigger <- notificationSrv.getTrigger(cfg.triggerConfig).toOption
-      trigger <- notificationSrv.getTriggers(notifConfig.value[String]("value"))
-    } yield (orgId.toString, trigger, None)
-
-    // Retrieve triggers configured for each user
-    val userTriggers: Iterator[(String, Trigger, Option[String])] = for {
-      (notifConfig, user, orgId) <- notificationRaw
-        .as("config")
-        .in("UserConfig")
-        .as("user")
-        .out("UserRole")
-        .out("RoleOrganisation")
-        .id()
-        .as("orgId")
-        .select()
-        .traversal
-        .asScala
-      trigger <- notificationSrv.getTriggers(notifConfig.value[String]("value"))
-    } yield (orgId.toString, trigger, Some(user.id().toString))
-
-    (organisationTriggers ++ userTriggers)
-      .toSeq
-      .groupBy(_._1)
-      .mapValues { tuple =>
-        tuple
-          .groupBy(_._2)
-          .mapValues { tuple2 =>
-            val inOrg   = tuple2.exists(_._3.isEmpty)
-            val userIds = tuple2.flatMap(_._3.toSeq)
-            (inOrg, userIds)
-          }
+object ConfigOps {
+
+  implicit class ConfigOpsDefs(traversal: Traversal.V[Config]) {
+    def triggerMap(notificationSrv: NotificationSrv): Map[String, Map[Trigger, (Boolean, Seq[String])]] = {
+
+      // Traversal of configuration version of type "notification"
+      def notificationRaw: Traversal[Config with Entity, Vertex, Converter[Config with Entity, Vertex]] =
+        traversal
+          .clone()
+          .has("name", P.eq[String]("notification"))
+
+      // Retrieve triggers configured for each organisation
+      val organisationTriggers: Iterator[(String, Trigger, Option[String])] = {
+        val configLabel         = StepLabel.v[Config]
+        val organisationIdLabel = StepLabel[String, AnyRef, Converter[String, AnyRef]]
+        for {
+          (notifConfig, orgId) <- notificationRaw
+            .as(configLabel)
+            .in[OrganisationConfig]
+            ._id
+            .as(organisationIdLabel)
+            .select((configLabel, organisationIdLabel))
+            .toIterator
+          //      cfg     <- notificationSrv.getConfig(notifConfig.value[String]("value"))
+          //      trigger <- notificationSrv.getTrigger(cfg.triggerConfig).toOption
+          trigger <- notificationSrv.getTriggers(notifConfig.value)
+        } yield (orgId, trigger, None: Option[String])
       }
-  }
 
-  def getValue[A: Reads](name: String): Traversal[JsValue, String] = this.has("name", name).value
+      // Retrieve triggers configured for each user
+      val userTriggers: Iterator[(String, Trigger, Option[String])] = {
+        val configLabel         = StepLabel.v[Config]
+        val userLabel           = StepLabel.v[User]
+        val organisationIdLabel = StepLabel[String, AnyRef, Converter[String, AnyRef]]
+        for {
+          (notifConfig, user, orgId) <- notificationRaw
+            .as(configLabel)
+            .in[UserConfig]
+            .v[User]
+            .as(userLabel)
+            .out[UserRole]
+            .out[RoleOrganisation]
+            ._id
+            .as(organisationIdLabel)
+            .select((configLabel, userLabel, organisationIdLabel))
+            .toIterator
+          trigger <- notificationSrv.getTriggers(notifConfig.value)
+        } yield (orgId, trigger, Some(user._id))
+      }
+
+      (organisationTriggers ++ userTriggers)
+        .toSeq
+        .groupBy(_._1)
+        .mapValues { tuple =>
+          tuple
+            .groupBy(_._2)
+            .mapValues { tuple2 =>
+              val inOrg   = tuple2.exists(_._3.isEmpty)
+              val userIds = tuple2.flatMap(_._3.toSeq)
+              (inOrg, userIds)
+            }
+        }
+    }
+
+    def getValue[A: Reads](name: String): Traversal[JsValue, String, Converter[JsValue, String]] = traversal.has("name", name).value(_.value)
+  }
 }
diff --git a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
index bc433afeb1..bae0496762 100644
--- a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
@@ -3,28 +3,26 @@ package org.thp.thehive.services
 import java.util.{Map => JMap}
 
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
-import org.apache.tinkerpop.gremlin.structure.T
+import org.apache.tinkerpop.gremlin.structure.{Edge, Graph}
+import org.thp.scalligraph.RichSeq
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
-import org.thp.scalligraph.services.{IntegrityCheckOps, RichElement, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps._
-import org.thp.scalligraph.{EntitySteps, RichSeq}
+import org.thp.scalligraph.services.{IntegrityCheckOps, VertexSrv}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal._
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
-import play.api.libs.json.{JsNull, JsObject, JsValue}
-import shapeless.HNil
+import org.thp.thehive.services.CustomFieldOps._
+import play.api.libs.json.{JsObject, JsValue}
 
-import scala.collection.JavaConverters._
 import scala.util.{Success, Try}
 
 @Singleton
 class CustomFieldSrv @Inject() (auditSrv: AuditSrv, organisationSrv: OrganisationSrv, @Named("integrity-check-actor") integrityCheckActor: ActorRef)(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[CustomField, CustomFieldSteps] {
+) extends VertexSrv[CustomField] {
 
   override def createEntity(e: CustomField)(implicit graph: Graph, authContext: AuthContext): Try[CustomField with Entity] = {
     integrityCheckActor ! IntegrityCheckActor.EntityAdded("CustomField")
@@ -37,7 +35,7 @@ class CustomFieldSrv @Inject() (auditSrv: AuditSrv, organisationSrv: Organisatio
       _       <- auditSrv.customField.create(created, created.toJson)
     } yield created
 
-  override def exists(e: CustomField)(implicit graph: Graph): Boolean = initSteps.getByName(e.name).exists()
+  override def exists(e: CustomField)(implicit graph: Graph): Boolean = startTraversal.getByName(e.name).exists
 
   def delete(c: CustomField with Entity, force: Boolean)(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
     get(c).remove() // TODO use force
@@ -46,148 +44,141 @@ class CustomFieldSrv @Inject() (auditSrv: AuditSrv, organisationSrv: Organisatio
     }
   }
 
-  def useCount(c: CustomField with Entity)(implicit graph: Graph): Map[String, Int] =
+  def useCount(c: CustomField with Entity)(implicit graph: Graph): Map[String, Long] =
     get(c)
       .in()
-      .groupCount(By[String](T.label))
-      .headOption()
-      .fold(Map.empty[String, Int])(_.asScala.collect { case (k, v) if k != "Audit" => k -> v.toInt }.toMap)
+      .groupCount(_.byLabel)
+      .headOption
+      .fold(Map.empty[String, Long])(_.filterNot(_._1 == "Audit"))
 
   override def update(
-      steps: CustomFieldSteps,
+      traversal: Traversal.V[CustomField],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(CustomFieldSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[CustomField], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (customFieldSteps, updatedFields) =>
         customFieldSteps
-          .newInstance()
-          .getOrFail()
+          .clone()
+          .getOrFail("CustomFields")
           .flatMap(auditSrv.customField.update(_, updatedFields))
     }
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): CustomFieldSteps = new CustomFieldSteps(raw)
-
-  override def get(idOrName: String)(implicit graph: Graph): CustomFieldSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[CustomField] =
     if (db.isValidId(idOrName)) super.getByIds(idOrName)
-    else initSteps.getByName(idOrName)
+    else startTraversal.getByName(idOrName)
 }
 
-@EntitySteps[CustomField]
-class CustomFieldSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[CustomField](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): CustomFieldSteps = new CustomFieldSteps(newRaw)
-  override def newInstance(): CustomFieldSteps                             = new CustomFieldSteps(raw.clone())
+object CustomFieldOps {
 
-  def get(idOrName: String): CustomFieldSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
+  implicit class CustomFieldOpsDefs(traversal: Traversal.V[CustomField]) {
+    def get(idOrName: String)(implicit db: Database): Traversal.V[CustomField] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
-  def getByName(name: String): CustomFieldSteps = new CustomFieldSteps(raw.has(Key("name") of name))
+    def getByName(name: String): Traversal.V[CustomField] = traversal.has("name", name)
+  }
 
-}
+  implicit class CustomFieldValueOpsDefs[C <: CustomFieldValue[_]](traversal: Traversal.E[C]) {
 
-class CustomFieldValueSteps(raw: GremlinScala[Edge])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends EdgeSteps[CustomFieldValue[_], Product, CustomField](raw) {
-  override def newInstance(): CustomFieldValueSteps = new CustomFieldValueSteps(raw.clone())
-
-  override def newInstance(newRaw: GremlinScala[Edge]): CustomFieldValueSteps = new CustomFieldValueSteps(newRaw)
-
-  def setValue(value: Option[Any]): Try[Unit] = {
-    val customFieldValueLabel = StepLabel[Edge]()
-    val typeLabel             = StepLabel[String]()
-
-    raw
-      .asInstanceOf[GremlinScala.Aux[Edge, HNil]]
-      .as(customFieldValueLabel)
-      .inV()
-      .value("type")
-      .as(typeLabel)
-      .select()
-      .traversal
-      .asScala
-      .toTry {
-        case (edge, typeName) =>
-          val tpe = CustomFieldType.get(typeName)
-          tpe.setValue(new CustomFieldValueEdge(db, edge), value)
-      }
-      .map(_ => ())
-  }
+    def setValue(value: Option[Any]): Try[Unit] = {
+      val customFieldValueLabel = StepLabel.identity[Edge]
+      val typeLabel             = StepLabel[CustomFieldType.Value, String, Converter[CustomFieldType.Value, String]]
 
-  private def edgeNameType: GremlinScala[(Edge, String, String)] = {
-    val customFieldValueLabel = StepLabel[Edge]()
-    val typeLabel             = StepLabel[JMap[AnyRef, AnyRef]]()
-    raw
-      .asInstanceOf[GremlinScala.Aux[Edge, HNil]]
-      .as(customFieldValueLabel)
-      .inV()
-      .valueMap("name", "type")
-      .as(typeLabel)
-      .select(customFieldValueLabel.name, typeLabel.name)
-      .map {
-        case SelectMap(map) =>
-          val ValueMap(values) = map.get(typeLabel)
-          (map.get(customFieldValueLabel), values.get("name").asInstanceOf[String], values.get("type").asInstanceOf[String])
-      }
-  }
+      traversal
+        .setConverter[Edge, Converter.Identity[Edge]](Converter.identity)
+        .as(customFieldValueLabel)
+        .inV
+        .v[CustomField]
+        .value(_.`type`)
+        .as(typeLabel)
+        .select((customFieldValueLabel, typeLabel))
+        .toSeq
+        .toTry {
+          case (edge, typeName) =>
+            val tpe = CustomFieldType.map(typeName)
+            tpe.setValue(new CustomFieldValueEdge(edge), value)
+        }
+        .map(_ => ())
+    }
 
-  def nameJsonValue: Traversal[(String, JsValue), (String, JsValue)] =
-    Traversal(
+    private def edgeNameType
+        : Traversal[(Edge, String, CustomFieldType.Value), JMap[String, Any], Converter[(Edge, String, CustomFieldType.Value), JMap[String, Any]]] = {
+      val customFieldValueLabel = StepLabel.identity[Edge]
+      val nameLabel             = StepLabel.v[CustomField]
+      val typeLabel             = StepLabel.v[CustomField]
+      traversal
+        .setConverter[Edge, Converter.Identity[Edge]](Converter.identity)
+        .as(customFieldValueLabel)
+        .inV
+        .v[CustomField]
+        .as(nameLabel, typeLabel)
+        .select(_.apply(customFieldValueLabel)(_.by).apply(nameLabel)(_.byValue(_.name)).apply(typeLabel)(_.byValue(_.`type`)))
+    }
+
+    def nameJsonValue: Traversal[(String, JsValue), JMap[String, Any], Converter[(String, JsValue), JMap[String, Any]]] =
       edgeNameType
-        .map {
+        .domainMap {
           case (edge, name, tpe) =>
-            name -> CustomFieldType.get(tpe).getJsonValue(new CustomFieldValueEdge(db, edge))
+            name -> CustomFieldType.map(tpe).getJsonValue(new CustomFieldValueEdge(edge))
         }
-    )
 
-  def jsonValue: Traversal[JsValue, JsValue] =
-    Traversal(
+    def jsonValue: Traversal[JsValue, JMap[String, Any], Converter[JsValue, JMap[String, Any]]] =
       edgeNameType
-        .map {
+        .domainMap {
           case (edge, _, tpe) =>
-            CustomFieldType.get(tpe).getJsonValue(new CustomFieldValueEdge(db, edge))
+            CustomFieldType.map(tpe).getJsonValue(new CustomFieldValueEdge(edge))
         }
-    )
 
-  def nameValue: Traversal[(String, Option[Any]), (String, Option[Any])] =
-    Traversal(
+    def nameValue: Traversal[(String, Option[_]), JMap[String, Any], Converter[(String, Option[_]), JMap[String, Any]]] =
       edgeNameType
-        .map {
+        .domainMap {
           case (edge, name, tpe) =>
-            name -> CustomFieldType.get(tpe).getValue(new CustomFieldValueEdge(db, edge))
+            name -> CustomFieldType.map(tpe).getValue(new CustomFieldValueEdge(edge))
         }
-    )
 
-  def value: Traversal[Any, Any] =
-    Traversal(
-      edgeNameType
-        .map {
-          case (edge, _, tpe) =>
-            CustomFieldType.get(tpe).getValue(new CustomFieldValueEdge(db, edge)).getOrElse(JsNull)
-        }
-    )
-
-  def richCustomField: Traversal[RichCustomField, RichCustomField] = {
-    val customFieldValueLabel = StepLabel[Edge]()
-    val customFieldLabel      = StepLabel[Vertex]()
-    Traversal(
-      raw
-        .asInstanceOf[GremlinScala.Aux[Edge, HNil]]
+    def selectValue: Traversal[Any, JMap[String, Any], Converter[Any, JMap[String, Any]]] =
+      traversal.choose[String, Any](
+        _.on(
+          _.inV
+            .v[CustomField]
+            .value(_.`type`)
+        ).option("boolean", _.value(_.booleanValue).cast[Any, Any].setConverter[Any, Converter.Identity[Any]](Converter.identity[Any]))
+          .option("date", _.value(_.dateValue).cast[Any, Any].setConverter[Any, Converter.Identity[Any]](Converter.identity[Any]))
+          .option("float", _.value(_.floatValue).cast[Any, Any].setConverter[Any, Converter.Identity[Any]](Converter.identity[Any]))
+          .option("integer", _.value(_.integerValue).cast[Any, Any].setConverter[Any, Converter.Identity[Any]](Converter.identity[Any]))
+          .option("string", _.value(_.stringValue).cast[Any, Any].setConverter[Any, Converter.Identity[Any]](Converter.identity[Any]))
+      )
+
+//    def value: Traversal[Any, JMap[String, Any], Converter[Any, JMap[String, Any]]] =
+//      edgeNameType
+//        .map {
+//          case (edge, _, tpe) =>
+//            CustomFieldType.map(tpe).getValue(new CustomFieldValueEdge(edge)).getOrElse(JsNull)
+//        }
+
+    def richCustomField: Traversal[RichCustomField, JMap[String, Any], Converter[RichCustomField, JMap[String, Any]]] = {
+      val customFieldValueLabel = StepLabel.identity[Edge]
+      val customFieldLabel      = StepLabel.v[CustomField]
+      traversal
+        .setConverter[Edge, Converter.Identity[Edge]](Converter.identity)
         .as(customFieldValueLabel)
-        .inV()
+        .inV
+        .v[CustomField]
         .as(customFieldLabel)
-        .select(customFieldValueLabel.name, customFieldLabel.name)
-        .map {
-          case SelectMap(m) => RichCustomField(m.get(customFieldLabel).as[CustomField], new CustomFieldValueEdge(db, m.get(customFieldValueLabel)))
+        .select((customFieldValueLabel, customFieldLabel))
+        .domainMap {
+          case (customFieldValue, customField) => RichCustomField(customField, new CustomFieldValueEdge(customFieldValue))
         }
-    )
+    }
+
+    //  def remove()     = raw.drop().i
   }
 
-//  def remove()     = raw.drop().i
 }
 
 class CustomFieldIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: CustomFieldSrv)
     extends IntegrityCheckOps[CustomField] {
-  override def resolve(entities: List[CustomField with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[CustomField with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/DashboardSrv.scala b/thehive/app/org/thp/thehive/services/DashboardSrv.scala
index ac5333b06c..01952eff21 100644
--- a/thehive/app/org/thp/thehive/services/DashboardSrv.scala
+++ b/thehive/app/org/thp/thehive/services/DashboardSrv.scala
@@ -1,30 +1,29 @@
 package org.thp.thehive.services
 
-import gremlin.scala.{Graph, GremlinScala, Key, Vertex}
+import java.util.{List => JList, Map => JMap}
+
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.UserOps._
 import play.api.libs.json.{JsObject, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.{Success, Try}
 
 @Singleton
 class DashboardSrv @Inject() (organisationSrv: OrganisationSrv, userSrv: UserSrv, auditSrv: AuditSrv)(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[Dashboard, DashboardSteps] {
+) extends VertexSrv[Dashboard] {
   val organisationDashboardSrv = new EdgeSrv[OrganisationDashboard, Organisation, Dashboard]
   val dashboardUserSrv         = new EdgeSrv[DashboardUser, Dashboard, User]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): DashboardSteps = new DashboardSteps(raw)
-
   def create(dashboard: Dashboard)(implicit graph: Graph, authContext: AuthContext): Try[RichDashboard] =
     for {
       createdDashboard <- createEntity(dashboard)
@@ -34,13 +33,13 @@ class DashboardSrv @Inject() (organisationSrv: OrganisationSrv, userSrv: UserSrv
     } yield RichDashboard(createdDashboard, Map.empty)
 
   override def update(
-      steps: DashboardSteps,
+      traversal: Traversal.V[Dashboard],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(DashboardSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Dashboard], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (dashboardSteps, updatedFields) =>
         dashboardSteps
-          .newInstance()
+          .clone()
           .getOrFail("Dashboard")
           .flatMap(auditSrv.dashboard.update(_, updatedFields))
     }
@@ -49,9 +48,13 @@ class DashboardSrv @Inject() (organisationSrv: OrganisationSrv, userSrv: UserSrv
       implicit graph: Graph,
       authContext: AuthContext
   ): Try[Unit] =
-    organisationDashboardSrv
-      .steps(get(dashboard).inToE[OrganisationDashboard].filter(_.outV().has("name", organisationName)).raw)
-      .update("writable" -> writable)
+    get(dashboard)
+      .inE[OrganisationDashboard]
+      .e[OrganisationDashboard]
+      .filter(_.outV.has("name", organisationName))
+      .update(_.writable, writable)
+      .fold
+      .getOrFail("Dashboard")
       .flatMap {
         case d if d.isEmpty =>
           organisationSrv
@@ -64,7 +67,7 @@ class DashboardSrv @Inject() (organisationSrv: OrganisationSrv, userSrv: UserSrv
       }
 
   def unshare(dashboard: Dashboard with Entity, organisationName: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
-    get(dashboard).inToE[OrganisationDashboard].filter(_.outV().has("name", organisationName)).remove()
+    get(dashboard).inE[OrganisationDashboard].filter(_.outV.has("name", organisationName)).remove()
     Success(()) // TODO add audit
   }
 
@@ -75,39 +78,43 @@ class DashboardSrv @Inject() (organisationSrv: OrganisationSrv, userSrv: UserSrv
     }
 }
 
-@EntitySteps[Dashboard]
-class DashboardSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[Dashboard](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex] = raw): DashboardSteps = new DashboardSteps(newRaw)
+object DashboardOps {
 
-  def visible(implicit authContext: AuthContext): DashboardSteps =
-    this.filter(_.or(_.user.current(authContext), _.inTo[OrganisationDashboard].has("name", authContext.organisation)))
+  implicit class DashboardOpsDefs(traversal: Traversal.V[Dashboard]) {
 
-  def organisation: OrganisationSteps = new OrganisationSteps(raw.inTo[OrganisationDashboard])
+    def visible(implicit authContext: AuthContext): Traversal.V[Dashboard] =
+      traversal.filter(_.or(_.user.current(authContext), _.in[OrganisationDashboard].has("name", authContext.organisation)))
 
-  def user: UserSteps = new UserSteps(raw.outTo[DashboardUser])
+    def organisation: Traversal.V[Organisation] = traversal.in[OrganisationDashboard].v[Organisation]
 
-  def canUpdate(implicit authContext: AuthContext): DashboardSteps =
-    this.filter(_.or(_.user.current(authContext), _.inToE[OrganisationDashboard].has("writable", true).outV.has("name", authContext.organisation)))
+    def user: Traversal.V[User] = traversal.out[DashboardUser].v[User]
 
-  def organisationShares: Traversal[Seq[(String, Boolean)], Seq[(String, Boolean)]] =
-    this
-      .outToE[OrganisationDashboard]
-      .project(
-        _.by(Key[Boolean]("writable"))
-          .by(_.inV())
+    def canUpdate(implicit authContext: AuthContext): Traversal.V[Dashboard] =
+      traversal.filter(
+        _.or(_.user.current(authContext), _.inE[OrganisationDashboard].has("writable", true).outV.has("name", authContext.organisation))
       )
-      .fold
-      .map(_.asScala.map { case (writable, orgs) => (orgs.value[String]("name"), writable) })
 
-  def richDashboard: Traversal[RichDashboard, RichDashboard] =
-    this
-      .project(
-        _.by
-          .by(_.organisationShares)
-      )
-      .map {
-        case (dashboard, organisationShares) => RichDashboard(dashboard.as[Dashboard], organisationShares.toMap)
-      }
+    def organisationShares: Traversal[Seq[(String, Boolean)], JList[JMap[String, Any]], Converter[Seq[(String, Boolean)], JList[JMap[String, Any]]]] =
+      traversal
+        .outE[OrganisationDashboard]
+        .e[OrganisationDashboard]
+        .project(
+          _.byValue(_.writable)
+            .by(_.inV)
+        )
+        .fold
+        .domainMap(_.map { case (writable, orgs) => (orgs.value[String]("name"), writable) })
+
+    def richDashboard: Traversal[RichDashboard, JMap[String, Any], Converter[RichDashboard, JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.organisationShares)
+        )
+        .domainMap {
+          case (dashboard, organisationShares) => RichDashboard(dashboard, organisationShares.toMap)
+        }
+
+  }
 
 }
diff --git a/thehive/app/org/thp/thehive/services/DataSrv.scala b/thehive/app/org/thp/thehive/services/DataSrv.scala
index f3854a2fde..b6fc1ee2da 100644
--- a/thehive/app/org/thp/thehive/services/DataSrv.scala
+++ b/thehive/app/org/thp/thehive/services/DataSrv.scala
@@ -3,24 +3,22 @@ package org.thp.thehive.services
 import java.lang.{Long => JLong}
 
 import akka.actor.ActorRef
-import gremlin.scala.{Graph, GremlinScala, P, Vertex}
 import javax.inject.{Inject, Named, Singleton}
-import org.apache.tinkerpop.gremlin.structure.T
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.process.traversal.P
+import org.apache.tinkerpop.gremlin.structure.{Graph, T}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.{VertexSrv, _}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.models._
+import org.thp.thehive.services.DataOps._
 
 import scala.util.{Success, Try}
 
 @Singleton
 class DataSrv @Inject() (@Named("integrity-check-actor") integrityCheckActor: ActorRef)(implicit @Named("with-thehive-schema") db: Database)
-    extends VertexSrv[Data, DataSteps] {
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): DataSteps = new DataSteps(raw)
-
+    extends VertexSrv[Data] {
   override def createEntity(e: Data)(implicit graph: Graph, authContext: AuthContext): Try[Data with Entity] =
     super.createEntity(e).map { data =>
       integrityCheckActor ! IntegrityCheckActor.EntityAdded("Data")
@@ -28,40 +26,38 @@ class DataSrv @Inject() (@Named("integrity-check-actor") integrityCheckActor: Ac
     }
 
   def create(e: Data)(implicit graph: Graph, authContext: AuthContext): Try[Data with Entity] =
-    initSteps
+    startTraversal
       .getByData(e.data)
-      .headOption()
+      .headOption
       .fold(createEntity(e))(Success(_))
 
-  override def exists(e: Data)(implicit graph: Graph): Boolean = initSteps.getByData(e.data).exists()
+  override def exists(e: Data)(implicit graph: Graph): Boolean = startTraversal.getByData(e.data).exists
 }
 
-@EntitySteps[Data]
-class DataSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Data](raw) {
+object DataOps {
 
-  def observables = new ObservableSteps(raw.inTo[ObservableData])
+  implicit class DataOpsDefs(traversal: Traversal.V[Data]) {
+    def observables = traversal.in[ObservableData].v[Observable]
 
-  def notShared(caseId: String): DataSteps = newInstance(
-    raw.filter(
-      _.inTo[ObservableData]
-        .inTo[ShareObservable]
-        .outTo[ShareCase]
-        .has(T.id, P.neq(caseId))
-        .count()
-        .is(P.eq(0))
-    )
-  )
+    def notShared(caseId: String): Traversal.V[Data] =
+      traversal.filter(
+        _.in[ObservableData]
+          .in[ShareObservable]
+          .out[ShareCase]
+          .has(T.id, P.neq(caseId))
+          .count
+          .is(P.eq(0))
+      )
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): DataSteps = new DataSteps(newRaw)
-  override def newInstance(): DataSteps                             = new DataSteps(raw.clone())
+    def getByData(data: String): Traversal.V[Data] = traversal.has("data", data)
 
-  def getByData(data: String): DataSteps = this.has("data", data)
+    def useCount: Traversal[Long, JLong, Converter[Long, JLong]] = traversal.in[ObservableData].count
+  }
 
-  def useCount: Traversal[JLong, JLong] = Traversal(raw.inTo[ObservableData].count())
 }
 
 class DataIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: DataSrv) extends IntegrityCheckOps[Data] {
-  override def resolve(entities: List[Data with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[Data with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/DatabaseWrapper.scala b/thehive/app/org/thp/thehive/services/DatabaseWrapper.scala
index 312569a4a7..ae762f23ba 100644
--- a/thehive/app/org/thp/thehive/services/DatabaseWrapper.scala
+++ b/thehive/app/org/thp/thehive/services/DatabaseWrapper.scala
@@ -1,107 +1,107 @@
-package org.thp.thehive.services
-
-import java.util.Date
-import java.util.function.Consumer
-
-import akka.NotUsed
-import akka.stream.scaladsl.Source
-import gremlin.scala._
-import javax.inject.Provider
-import org.apache.tinkerpop.gremlin.structure.{Graph, Transaction}
-import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.Model.Base
-import org.thp.scalligraph.models._
-
-import scala.reflect.runtime.{universe => ru}
-import scala.util.Try
-
-class DatabaseWrapper(dbProvider: Provider[Database]) extends Database {
-  lazy val db: Database                                               = dbProvider.get()
-  override lazy val createdAtMapping: SingleMapping[Date, _]          = db.createdAtMapping
-  override lazy val createdByMapping: SingleMapping[String, String]   = db.createdByMapping
-  override lazy val updatedAtMapping: OptionMapping[Date, _]          = db.updatedAtMapping
-  override lazy val updatedByMapping: OptionMapping[String, String]   = db.updatedByMapping
-  override lazy val binaryMapping: SingleMapping[Array[Byte], String] = db.binaryMapping
-
-  override def close(): Unit = db.close()
-
-  override def isValidId(id: String): Boolean = db.isValidId(id)
-
-  override def createVertex[V <: Product](graph: Graph, authContext: AuthContext, model: Model.Vertex[V], v: V): V with Entity =
-    db.createVertex(graph, authContext, model, v)
-
-  override def createEdge[E <: Product, FROM <: Product, TO <: Product](
-      graph: Graph,
-      authContext: AuthContext,
-      model: Model.Edge[E, FROM, TO],
-      e: E,
-      from: FROM with Entity,
-      to: TO with Entity
-  ): E with Entity = db.createEdge(graph, authContext, model, e, from, to)
-
-  override def update[E <: Product](
-      elementTraversal: GremlinScala[_ <: Element],
-      fields: Seq[(String, Any)],
-      model: Base[E],
-      graph: Graph,
-      authContext: AuthContext
-  ): Try[Seq[E with Entity]] = db.update(elementTraversal, fields, model, graph, authContext)
-
-  override def roTransaction[A](body: Graph => A): A                                                           = db.roTransaction(body)
-  override def transaction[A](body: Graph => A): A                                                             = db.transaction(body)
-  override def tryTransaction[A](body: Graph => Try[A]): Try[A]                                                = db.tryTransaction(body)
-  override def source[A](query: Graph => Iterator[A]): Source[A, NotUsed]                                      = db.source(query)
-  override def source[A, B](body: Graph => (Iterator[A], B)): (Source[A, NotUsed], B)                          = db.source(body)
-  override def currentTransactionId(graph: Graph): AnyRef                                                      = db.currentTransactionId(graph)
-  override def addCallback(callback: () => Try[Unit])(implicit graph: Graph): Unit                             = db.addCallback(callback)
-  override def takeCallbacks(graph: Graph): List[() => Try[Unit]]                                              = db.takeCallbacks(graph)
-  override def version(module: String): Int                                                                    = db.version(module)
-  override def setVersion(module: String, v: Int): Try[Unit]                                                   = db.setVersion(module, v)
-  override def getModel[E <: Product: ru.TypeTag]: Base[E]                                                     = db.getModel[E]
-  override def getVertexModel[E <: Product: ru.TypeTag]: Model.Vertex[E]                                       = db.getVertexModel[E]
-  override def getEdgeModel[E <: Product: ru.TypeTag, FROM <: Product, TO <: Product]: Model.Edge[E, FROM, TO] = db.getEdgeModel[E, FROM, TO]
-  override def createSchemaFrom(schemaObject: Schema)(implicit authContext: AuthContext): Try[Unit]            = db.createSchemaFrom(schemaObject)(authContext)
-  override def createSchema(model: Model, models: Model*): Try[Unit]                                           = db.createSchema(model, models: _*)
-  override def createSchema(models: Seq[Model]): Try[Unit]                                                     = db.createSchema(models)
-  override def addSchemaIndexes(schemaObject: Schema): Try[Unit]                                               = db.addSchemaIndexes(schemaObject)
-  override def addSchemaIndexes(model: Model, models: Model*): Try[Unit]                                       = db.addSchemaIndexes(model, models: _*)
-  override def addSchemaIndexes(models: Seq[Model]): Try[Unit]                                                 = db.addSchemaIndexes(models)
-  override def enableIndexes(): Try[Unit]                                                                      = db.enableIndexes()
-  override def removeAllIndexes(): Unit                                                                        = db.removeAllIndexes()
-  override def addProperty[T](model: String, propertyName: String, mapping: Mapping[_, _, _]): Try[Unit] =
-    db.addProperty(model, propertyName, mapping)
-  override def removeProperty(model: String, propertyName: String, usedOnlyByThisModel: Boolean): Try[Unit] =
-    db.removeProperty(model, propertyName, usedOnlyByThisModel)
-  override def addIndex(model: String, indexType: IndexType.Value, properties: Seq[String]): Try[Unit] = db.addIndex(model, indexType, properties)
-  override def drop(): Unit                                                                            = db.drop()
-
-  override def getSingleProperty[D, G](element: Element, key: String, mapping: SingleMapping[D, G]): D = db.getSingleProperty(element, key, mapping)
-
-  override def getOptionProperty[D, G](element: Element, key: String, mapping: OptionMapping[D, G]): Option[D] =
-    db.getOptionProperty(element, key, mapping)
-  override def getListProperty[D, G](element: Element, key: String, mapping: ListMapping[D, G]): Seq[D] = db.getListProperty(element, key, mapping)
-  override def getSetProperty[D, G](element: Element, key: String, mapping: SetMapping[D, G]): Set[D]   = db.getSetProperty(element, key, mapping)
-  override def getProperty[D](element: Element, key: String, mapping: Mapping[D, _, _]): D              = db.getProperty(element, key, mapping)
-
-  override def setSingleProperty[D, G](element: Element, key: String, value: D, mapping: SingleMapping[D, _]): Unit =
-    db.setSingleProperty[D, G](element, key, value, mapping)
-
-  override def setOptionProperty[D, G](element: Element, key: String, value: Option[D], mapping: OptionMapping[D, _]): Unit =
-    db.setOptionProperty[D, G](element, key, value, mapping)
-
-  override def setListProperty[D, G](element: Element, key: String, values: Seq[D], mapping: ListMapping[D, _]): Unit =
-    db.setListProperty[D, G](element, key, values, mapping)
-
-  override def setSetProperty[D, G](element: Element, key: String, values: Set[D], mapping: SetMapping[D, _]): Unit =
-    db.setSetProperty[D, G](element, key, values, mapping)
-  override def setProperty[D](element: Element, key: String, value: D, mapping: Mapping[D, _, _]): Unit    = db.setProperty(element, key, value, mapping)
-  override def labelFilter[E <: Element](model: Model): GremlinScala[E] => GremlinScala[E]                 = db.labelFilter(model)
-  override def labelFilter[E <: Element](label: String): GremlinScala[E] => GremlinScala[E]                = db.labelFilter(label)
-  override lazy val extraModels: Seq[Model]                                                                = db.extraModels
-  override def addTransactionListener(listener: Consumer[Transaction.Status])(implicit graph: Graph): Unit = db.addTransactionListener(listener)
-  override def mapPredicate[T](predicate: P[T]): P[T]                                                      = db.mapPredicate(predicate)
-  override def toId(id: Any): Any                                                                          = db.toId(id)
-
-  override val binaryLinkModel: Model.Edge[BinaryLink, Binary, Binary] = db.binaryLinkModel
-  override val binaryModel: Model.Vertex[Binary]                       = db.binaryModel
-}
+//package org.thp.thehive.services
+//
+//import java.util.Date
+//import java.util.function.Consumer
+//
+//import akka.NotUsed
+//import akka.stream.scaladsl.Source
+//
+//import javax.inject.Provider
+//import org.apache.tinkerpop.gremlin.structure.{Graph, Transaction}
+//import org.thp.scalligraph.auth.AuthContext
+//import org.thp.scalligraph.models.Model.Base
+//import org.thp.scalligraph.models._
+//
+//import scala.reflect.runtime.{universe => ru}
+//import scala.util.Try
+//
+//class DatabaseWrapper(dbProvider: Provider[Database]) extends Database {
+//  lazy val db: Database                                               = dbProvider.get()
+//  override lazy val createdAtMapping: SingleMapping[Date, _]          = db.createdAtMapping
+//  override lazy val createdByMapping: SingleMapping[String, String]   = db.createdByMapping
+//  override lazy val updatedAtMapping: OptionMapping[Date, _]          = db.updatedAtMapping
+//  override lazy val updatedByMapping: OptionMapping[String, String]   = db.updatedByMapping
+//  override lazy val binaryMapping: SingleMapping[Array[Byte], String] = db.binaryMapping
+//
+//  override def close(): Unit = db.close()
+//
+//  override def isValidId(id: String): Boolean = db.isValidId(id)
+//
+//  override def createVertex[V <: Product](graph: Graph, authContext: AuthContext, model: Model.Vertex[V], v: V): V with Entity =
+//    db.createVertex(graph, authContext, model, v)
+//
+//  override def createEdge[E <: Product, FROM <: Product, TO <: Product](
+//      graph: Graph,
+//      authContext: AuthContext,
+//      model: Model.Edge[E],
+//      e: E,
+//      from: FROM with Entity,
+//      to: TO with Entity
+//  ): E with Entity = db.createEdge(graph, authContext, model, e, from, to)
+//
+////  override def update[E <: Product](
+////      elementTraversal: GremlinScala[_ <: Element],
+////      fields: Seq[(String, Any)],
+////      model: Base[E],
+////      graph: Graph,
+////      authContext: AuthContext
+////  ): Try[Seq[E with Entity]] = db.update(elementTraversal, fields, model, graph, authContext)
+//
+//  override def roTransaction[A](body: Graph => A): A                                                           = db.roTransaction(body)
+//  override def transaction[A](body: Graph => A): A                                                             = db.transaction(body)
+//  override def tryTransaction[A](body: Graph => Try[A]): Try[A]                                                = db.tryTransaction(body)
+//  override def source[A](query: Graph => Iterator[A]): Source[A, NotUsed]                                      = db.source(query)
+//  override def source[A, B](body: Graph => (Iterator[A], B)): (Source[A, NotUsed], B)                          = db.source(body)
+//  override def currentTransactionId(graph: Graph): AnyRef                                                      = db.currentTransactionId(graph)
+//  override def addCallback(callback: () => Try[Unit])(implicit graph: Graph): Unit                             = db.addCallback(callback)
+//  override def takeCallbacks(graph: Graph): List[() => Try[Unit]]                                              = db.takeCallbacks(graph)
+//  override def version(module: String): Int                                                                    = db.version(module)
+//  override def setVersion(module: String, v: Int): Try[Unit]                                                   = db.setVersion(module, v)
+//  override def getModel[E <: Product: ru.TypeTag]: Base[E]                                                     = db.getModel[E]
+//  override def getVertexModel[E <: Product: ru.TypeTag]: Model.Vertex[E]                                       = db.getVertexModel[E]
+//  override def getEdgeModel[E <: Product: ru.TypeTag, FROM <: Product, TO <: Product]: Model.Edge[E, FROM, TO] = db.getEdgeModel[E, FROM, TO]
+//  override def createSchemaFrom(schemaObject: Schema)(implicit authContext: AuthContext): Try[Unit]            = db.createSchemaFrom(schemaObject)(authContext)
+//  override def createSchema(model: Model, models: Model*): Try[Unit]                                           = db.createSchema(model, models: _*)
+//  override def createSchema(models: Seq[Model]): Try[Unit]                                                     = db.createSchema(models)
+//  override def addSchemaIndexes(schemaObject: Schema): Try[Unit]                                               = db.addSchemaIndexes(schemaObject)
+//  override def addSchemaIndexes(model: Model, models: Model*): Try[Unit]                                       = db.addSchemaIndexes(model, models: _*)
+//  override def addSchemaIndexes(models: Seq[Model]): Try[Unit]                                                 = db.addSchemaIndexes(models)
+//  override def enableIndexes(): Try[Unit]                                                                      = db.enableIndexes()
+//  override def removeAllIndexes(): Unit                                                                        = db.removeAllIndexes()
+//  override def addProperty[T](model: String, propertyName: String, mapping: Mapping[_, _, _]): Try[Unit] =
+//    db.addProperty(model, propertyName, mapping)
+//  override def removeProperty(model: String, propertyName: String, usedOnlyByThisModel: Boolean): Try[Unit] =
+//    db.removeProperty(model, propertyName, usedOnlyByThisModel)
+//  override def addIndex(model: String, indexType: IndexType.Value, properties: Seq[String]): Try[Unit] = db.addIndex(model, indexType, properties)
+//  override def drop(): Unit                                                                            = db.drop()
+//
+//  override def getSingleProperty[D, G](element: Element, key: String, mapping: SingleMapping[D, G]): D = db.getSingleProperty(element, key, mapping)
+//
+//  override def getOptionProperty[D, G](element: Element, key: String, mapping: OptionMapping[D, G]): Option[D] =
+//    db.getOptionProperty(element, key, mapping)
+//  override def getListProperty[D, G](element: Element, key: String, mapping: ListMapping[D, G]): Seq[D] = db.getListProperty(element, key, mapping)
+//  override def getSetProperty[D, G](element: Element, key: String, mapping: SetMapping[D, G]): Set[D]   = db.getSetProperty(element, key, mapping)
+//  override def getProperty[D](element: Element, key: String, mapping: Mapping[D, _, _]): D              = db.getProperty(element, key, mapping)
+//
+//  override def setSingleProperty[D, G](element: Element, key: String, value: D, mapping: SingleMapping[D, _]): Unit =
+//    db.setSingleProperty[D, G](element, key, value, mapping)
+//
+//  override def setOptionProperty[D, G](element: Element, key: String, value: Option[D], mapping: OptionMapping[D, _]): Unit =
+//    db.setOptionProperty[D, G](element, key, value, mapping)
+//
+//  override def setListProperty[D, G](element: Element, key: String, values: Seq[D], mapping: ListMapping[D, _]): Unit =
+//    db.setListProperty[D, G](element, key, values, mapping)
+//
+//  override def setSetProperty[D, G](element: Element, key: String, values: Set[D], mapping: SetMapping[D, _]): Unit =
+//    db.setSetProperty[D, G](element, key, values, mapping)
+//  override def setProperty[D](element: Element, key: String, value: D, mapping: Mapping[D, _, _]): Unit    = db.setProperty(element, key, value, mapping)
+//  override def labelFilter[E <: Element](model: Model): GremlinScala[E] => GremlinScala[E]                 = db.labelFilter(model)
+//  override def labelFilter[E <: Element](label: String): GremlinScala[E] => GremlinScala[E]                = db.labelFilter(label)
+//  override lazy val extraModels: Seq[Model]                                                                = db.extraModels
+//  override def addTransactionListener(listener: Consumer[Transaction.Status])(implicit graph: Graph): Unit = db.addTransactionListener(listener)
+//  override def mapPredicate[T](predicate: P[T]): P[T]                                                      = db.mapPredicate(predicate)
+//  override def toId(id: Any): Any                                                                          = db.toId(id)
+//
+//  override val binaryLinkModel: Model.Edge[BinaryLink, Binary, Binary] = db.binaryLinkModel
+//  override val binaryModel: Model.Vertex[Binary]                       = db.binaryModel
+//}
diff --git a/thehive/app/org/thp/thehive/services/FlowActor.scala b/thehive/app/org/thp/thehive/services/FlowActor.scala
index b921746aa7..9b6e258bf3 100644
--- a/thehive/app/org/thp/thehive/services/FlowActor.scala
+++ b/thehive/app/org/thp/thehive/services/FlowActor.scala
@@ -1,22 +1,19 @@
 package org.thp.thehive.services
 
-import java.util.{Date, List => JList}
-
 import akka.actor.{Actor, ActorRef, ActorSystem, PoisonPill, Props}
 import akka.cluster.singleton.{ClusterSingletonManager, ClusterSingletonManagerSettings, ClusterSingletonProxy, ClusterSingletonProxySettings}
 import com.google.inject.name.Names
 import com.google.inject.{Injector, Key => GuiceKey}
-import gremlin.scala.{By, Key}
 import javax.inject.{Inject, Provider, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.Order
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.services.EventSrv
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.GuiceAkkaExtension
+import org.thp.thehive.services.AuditOps._
+import org.thp.thehive.services.CaseOps._
 import play.api.cache.SyncCacheApi
 
-import scala.collection.JavaConverters._
-
 object FlowActor {
   case class FlowId(organisation: String, caseId: Option[String]) {
     override def toString: String = s"$organisation;${caseId.getOrElse("-")}"
@@ -40,11 +37,11 @@ class FlowActor extends Actor {
       val auditIds = cache.getOrElseUpdate(flowId.toString) {
         db.roTransaction { implicit graph =>
           caseId
-            .fold(auditSrv.initSteps.has("mainAction", true).visible(organisation))(caseSrv.getByIds(_).audits(organisation))
-            .order(List(By(Key[Date]("_createdAt"), Order.desc)))
+            .fold(auditSrv.startTraversal.has("mainAction", true).visible(organisation))(caseSrv.getByIds(_).audits(organisation))
+            .sort(_.by("_createdAt", Order.desc))
             .range(0, 10)
             ._id
-            .toList
+            .toSeq
         }
       }
       sender ! AuditIds(auditIds)
@@ -55,20 +52,20 @@ class FlowActor extends Actor {
           .has("mainAction", true)
           .project(
             _.by(_._id)
-              .by(_.organisation.name.fold)
+              .by(_.organisation.value(_.name).fold)
               .by(_.`case`._id.fold)
           )
           .toIterator
           .foreach {
-            case (id: AnyRef, organisations: JList[String], cases: JList[AnyRef]) =>
-              organisations.asScala.foreach { organisation =>
+            case (id, organisations, cases) =>
+              organisations.foreach { organisation =>
                 val cacheKey = FlowId(organisation, None).toString
                 val ids      = cache.get[List[String]](cacheKey).getOrElse(Nil)
-                cache.set(cacheKey, id.toString :: ids)
-                cases.asScala.foreach { caseId =>
-                  val cacheKey: String = FlowId(organisation, Some(caseId.toString)).toString
+                cache.set(cacheKey, id :: ids)
+                cases.foreach { caseId =>
+                  val cacheKey: String = FlowId(organisation, Some(caseId)).toString
                   val ids              = cache.get[List[String]](cacheKey).getOrElse(Nil)
-                  cache.set(cacheKey, (id.toString :: ids).take(10))
+                  cache.set(cacheKey, (id :: ids).take(10))
                 }
               }
           }
diff --git a/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala b/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
index 331f44978b..42d766857e 100644
--- a/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
@@ -1,28 +1,27 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.{CreateError, EntitySteps}
+import org.apache.tinkerpop.gremlin.structure.Graph
+import org.thp.scalligraph.CreateError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.{IntegrityCheckOps, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.ImpactStatus
+import org.thp.thehive.services.ImpactStatusOps._
 
 import scala.util.{Failure, Success, Try}
 
 @Singleton
 class ImpactStatusSrv @Inject() (@Named("integrity-check-actor") integrityCheckActor: ActorRef)(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[ImpactStatus, ImpactStatusSteps] {
+) extends VertexSrv[ImpactStatus] {
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ImpactStatusSteps = new ImpactStatusSteps(raw)
-
-  override def get(idOrName: String)(implicit graph: Graph): ImpactStatusSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[ImpactStatus] =
     if (db.isValidId(idOrName)) getByIds(idOrName)
-    else initSteps.getByName(idOrName)
+    else startTraversal.getByName(idOrName)
 
   override def createEntity(e: ImpactStatus)(implicit graph: Graph, authContext: AuthContext): Try[ImpactStatus with Entity] = {
     integrityCheckActor ! IntegrityCheckActor.EntityAdded("ImpactStatus")
@@ -35,25 +34,22 @@ class ImpactStatusSrv @Inject() (@Named("integrity-check-actor") integrityCheckA
     else
       createEntity(impactStatus)
 
-  override def exists(e: ImpactStatus)(implicit graph: Graph): Boolean = initSteps.getByName(e.value).exists()
+  override def exists(e: ImpactStatus)(implicit graph: Graph): Boolean = startTraversal.getByName(e.value).exists
 }
 
-@EntitySteps[ImpactStatus]
-class ImpactStatusSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[ImpactStatus](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): ImpactStatusSteps = new ImpactStatusSteps(newRaw)
-  override def newInstance(): ImpactStatusSteps                             = new ImpactStatusSteps(raw.clone())
-
-  def get(idOrName: String): ImpactStatusSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
+object ImpactStatusOps {
+  implicit class ImpactStatusOpsDefs(traversal: Traversal.V[ImpactStatus]) {
+    def get(idOrName: String)(implicit db: Database): Traversal.V[ImpactStatus] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
-  def getByName(name: String): ImpactStatusSteps = new ImpactStatusSteps(raw.has(Key("value") of name))
+    def getByName(name: String): Traversal.V[ImpactStatus] = traversal.has("value", name).v[ImpactStatus]
+  }
 }
 
 class ImpactStatusIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: ImpactStatusSrv)
     extends IntegrityCheckOps[ImpactStatus] {
-  override def resolve(entities: List[ImpactStatus with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[ImpactStatus with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/KeyValueSrv.scala b/thehive/app/org/thp/thehive/services/KeyValueSrv.scala
index 8b94bb432c..4f88fb5a05 100644
--- a/thehive/app/org/thp/thehive/services/KeyValueSrv.scala
+++ b/thehive/app/org/thp/thehive/services/KeyValueSrv.scala
@@ -1,22 +1,15 @@
 package org.thp.thehive.services
 
-import gremlin.scala.{Graph, GremlinScala, Vertex}
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.VertexSrv
-import org.thp.scalligraph.steps.VertexSteps
 import org.thp.thehive.models.KeyValue
 
 import scala.util.Try
 
 @Singleton
-class KeyValueSrv @Inject() ()(implicit @Named("with-thehive-schema") db: Database) extends VertexSrv[KeyValue, KeyValueSteps] {
+class KeyValueSrv @Inject() ()(implicit @Named("with-thehive-schema") db: Database) extends VertexSrv[KeyValue] {
   def create(e: KeyValue)(implicit graph: Graph, authContext: AuthContext): Try[KeyValue with Entity] = createEntity(e)
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): KeyValueSteps                 = new KeyValueSteps(raw)
-}
-
-class KeyValueSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[KeyValue](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): KeyValueSteps = new KeyValueSteps(newRaw)
-  override def newInstance(): KeyValueSteps                             = new KeyValueSteps(raw.clone())
 }
diff --git a/thehive/app/org/thp/thehive/services/LocalKeyAuthSrv.scala b/thehive/app/org/thp/thehive/services/LocalKeyAuthSrv.scala
index a5aed7f2eb..621393cd0b 100644
--- a/thehive/app/org/thp/thehive/services/LocalKeyAuthSrv.scala
+++ b/thehive/app/org/thp/thehive/services/LocalKeyAuthSrv.scala
@@ -6,7 +6,8 @@ import javax.inject.{Inject, Named, Provider, Singleton}
 import org.thp.scalligraph.NotFoundError
 import org.thp.scalligraph.auth._
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.services.UserOps._
 import play.api.Configuration
 import play.api.mvc.RequestHeader
 
@@ -33,9 +34,9 @@ class LocalKeyAuthSrv(
   override def authenticate(key: String, organisation: Option[String])(implicit request: RequestHeader): Try[AuthContext] =
     db.roTransaction { implicit graph =>
       userSrv
-        .initSteps
+        .startTraversal
         .getByAPIKey(key)
-        .getOrFail()
+        .getOrFail("User")
         .flatMap(user => localUserSrv.getAuthContext(request, user.login, organisation))
     }
 
@@ -44,8 +45,9 @@ class LocalKeyAuthSrv(
       val newKey = generateKey()
       userSrv
         .get(username)
-        .update("apikey" -> Some(newKey))
-        .map(_ => newKey)
+        .update(_.apikey, Some(newKey))
+        .domainMap(_ => newKey)
+        .getOrFail("User")
     }
 
   override def getKey(username: String)(implicit authContext: AuthContext): Try[String] =
@@ -59,8 +61,9 @@ class LocalKeyAuthSrv(
     db.tryTransaction { implicit graph =>
       userSrv
         .get(username)
-        .update("apikey" -> None)
-        .map(_ => ())
+        .update(_.apikey, None)
+        .domainMap(_ => ())
+        .getOrFail("User")
     }
 }
 
diff --git a/thehive/app/org/thp/thehive/services/LocalPasswordAuthSrv.scala b/thehive/app/org/thp/thehive/services/LocalPasswordAuthSrv.scala
index 6ae9933010..52b8ce2397 100644
--- a/thehive/app/org/thp/thehive/services/LocalPasswordAuthSrv.scala
+++ b/thehive/app/org/thp/thehive/services/LocalPasswordAuthSrv.scala
@@ -4,7 +4,7 @@ import io.github.nremond.SecureHash
 import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.auth.{AuthCapability, AuthContext, AuthSrv, AuthSrvProvider}
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Hasher
 import org.thp.scalligraph.{AuthenticationError, AuthorizationError}
 import org.thp.thehive.models.User
@@ -63,7 +63,8 @@ class LocalPasswordAuthSrv(@Named("with-thehive-schema") db: Database, userSrv:
     db.tryTransaction { implicit graph =>
       userSrv
         .get(username)
-        .update("password" -> Some(hashPassword(newPassword)))
+        .update(_.password, Some(hashPassword(newPassword)))
+        .getOrFail("User")
         .map(_ => ())
     }
 }
diff --git a/thehive/app/org/thp/thehive/services/LocalUserSrv.scala b/thehive/app/org/thp/thehive/services/LocalUserSrv.scala
index d01214cf27..336c78a724 100644
--- a/thehive/app/org/thp/thehive/services/LocalUserSrv.scala
+++ b/thehive/app/org/thp/thehive/services/LocalUserSrv.scala
@@ -3,10 +3,11 @@ package org.thp.thehive.services
 import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.auth.{AuthContext, AuthContextImpl, User => ScalligraphUser, UserSrv => ScalligraphUserSrv}
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Instance
 import org.thp.scalligraph.{AuthenticationError, CreateError, NotFoundError}
 import org.thp.thehive.models.{Organisation, Permissions, Profile, User}
+import org.thp.thehive.services.UserOps._
 import play.api.Configuration
 import play.api.libs.json.JsObject
 import play.api.mvc.RequestHeader
@@ -27,21 +28,21 @@ class LocalUserSrv @Inject() (
       val requestId = Instance.getRequestId(request)
       val userSteps = userSrv.get(userId)
 
-      if (userSteps.newInstance().exists()) {
+      if (userSteps.clone().exists)
         userSteps
-          .newInstance()
+          .clone()
           .getAuthContext(requestId, organisationName)
-          .headOption()
+          .headOption
           .orElse {
             organisationName.flatMap { org =>
               userSteps
                 .getAuthContext(requestId, Organisation.administration.name)
-                .headOption()
+                .headOption
                 .map(authContext => authContext.changeOrganisation(org, authContext.permissions))
             }
           }
           .fold[Try[AuthContext]](Failure(AuthenticationError("Authentication failure")))(Success.apply)
-      } else Failure(NotFoundError(s"User $userId not found"))
+      else Failure(NotFoundError(s"User $userId not found"))
     }
 
   override def createUser(userId: String, userInfo: JsObject): Try[ScalligraphUser] = {
diff --git a/thehive/app/org/thp/thehive/services/LogSrv.scala b/thehive/app/org/thp/thehive/services/LogSrv.scala
index ebf543e5d5..7af9f11de9 100644
--- a/thehive/app/org/thp/thehive/services/LogSrv.scala
+++ b/thehive/app/org/thp/thehive/services/LogSrv.scala
@@ -1,28 +1,26 @@
 package org.thp.thehive.services
 
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.LogOps._
 import play.api.libs.json.{JsObject, Json}
 
-import scala.collection.JavaConverters._
 import scala.util.Try
 
 @Singleton
 class LogSrv @Inject() (attachmentSrv: AttachmentSrv, auditSrv: AuditSrv)(implicit @Named("with-thehive-schema") db: Database)
-    extends VertexSrv[Log, LogSteps] {
-  val taskLogSrv                                                                 = new EdgeSrv[TaskLog, Task, Log]
-  val logAttachmentSrv                                                           = new EdgeSrv[LogAttachment, Log, Attachment]
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): LogSteps = new LogSteps(raw)
+    extends VertexSrv[Log] {
+  val taskLogSrv       = new EdgeSrv[TaskLog, Task, Log]
+  val logAttachmentSrv = new EdgeSrv[LogAttachment, Log, Attachment]
 
   def create(log: Log, task: Task with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Log with Entity] =
     for {
@@ -33,7 +31,7 @@ class LogSrv @Inject() (attachmentSrv: AttachmentSrv, auditSrv: AuditSrv)(implic
 
   def addAttachment(log: Log with Entity, file: FFile)(implicit graph: Graph, authContext: AuthContext): Try[Attachment with Entity] =
     for {
-      task       <- get(log).task.getOrFail()
+      task       <- get(log).task.getOrFail("Task")
       attachment <- attachmentSrv.create(file)
       _          <- addAttachment(log, attachment)
       _          <- auditSrv.log.update(log, task, Json.obj("attachment" -> attachment.name))
@@ -45,99 +43,95 @@ class LogSrv @Inject() (attachmentSrv: AttachmentSrv, auditSrv: AuditSrv)(implic
   )(implicit graph: Graph, authContext: AuthContext): Try[Attachment with Entity] =
     for {
       _    <- logAttachmentSrv.create(LogAttachment(), log, attachment)
-      task <- get(log).task.getOrFail()
+      task <- get(log).task.getOrFail("Task")
       _    <- auditSrv.log.update(log, task, Json.obj("attachment" -> attachment.name))
     } yield attachment
 
   def cascadeRemove(log: Log with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
       _    <- get(log).attachments.toIterator.toTry(attachmentSrv.cascadeRemove(_))
-      task <- get(log).task.getOrFail()
+      task <- get(log).task.getOrFail("Task")
       _ = get(log._id).remove()
       _ <- auditSrv.log.delete(log, Some(task))
     } yield ()
 
   override def update(
-      steps: LogSteps,
+      traversal: Traversal.V[Log],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(LogSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Log], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (logSteps, updatedFields) =>
         for {
-          task <- logSteps.newInstance().task.getOrFail()
-          log  <- logSteps.getOrFail()
+          task <- logSteps.clone().task.getOrFail("Task")
+          log  <- logSteps.getOrFail("Log")
           _    <- auditSrv.log.update(log, task, updatedFields)
         } yield ()
     }
 }
 
-@EntitySteps[Log]
-class LogSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Log](raw) {
+object LogOps {
 
-  def task = new TaskSteps(raw.in("TaskLog"))
+  implicit class LogOpsDefs(traversal: Traversal.V[Log]) {
+    def task = traversal.in("TaskLog").v[Task]
 
-  def visible(implicit authContext: AuthContext): LogSteps =
-    newInstance(
-      raw.filter(
-        _.inTo[TaskLog]
-          .inTo[ShareTask]
-          .inTo[OrganisationShare]
-          .has(Key("name") of authContext.organisation)
-      )
-    )
-
-  def attachments = new AttachmentSteps(raw.outTo[LogAttachment])
-
-  def `case` = new CaseSteps(
-    raw
-      .inTo[TaskLog]
-      .inTo[ShareTask]
-      .outTo[ShareCase]
-  )
-
-  def can(permission: Permission)(implicit authContext: AuthContext): LogSteps =
-    if (authContext.permissions.contains(permission))
-      this.filter(
-        _.inTo[TaskLog]
-          .inTo[ShareTask]
-          .filter(_.outTo[ShareProfile].has("permissions", permission))
-          .inTo[OrganisationShare]
+    def visible(implicit authContext: AuthContext): Traversal.V[Log] =
+      traversal.filter(
+        _.in[TaskLog]
+          .in[ShareTask]
+          .in[OrganisationShare]
           .has("name", authContext.organisation)
       )
-    else
-      this.limit(0)
-
-  override def newInstance(newRaw: GremlinScala[Vertex]): LogSteps = new LogSteps(newRaw)
-  override def newInstance(): LogSteps                             = new LogSteps(raw.clone())
 
-  def richLog: Traversal[RichLog, RichLog] =
-    this
-      .project(
-        _.by
-          .by(_.attachments.fold)
-      )
-      .map {
-        case (log, attachments) =>
-          RichLog(
-            log.as[Log],
-            attachments.asScala.map(_.as[Attachment])
-          )
-      }
-
-  def richLogWithCustomRenderer[A](
-      entityRenderer: LogSteps => TraversalLike[_, A]
-  )(implicit authContext: AuthContext): Traversal[(RichLog, A), (RichLog, A)] =
-    this
-      .project(
-        _.by
-          .by(_.attachments.fold)
-          .by(entityRenderer)
-      )
-      .map {
-        case (log, attachments, renderedEntity) =>
-          RichLog(
-            log.as[Log],
-            attachments.asScala.map(_.as[Attachment])
-          ) -> renderedEntity
-      }
+    def attachments = traversal.out[LogAttachment].v[Attachment]
+
+    def `case` =
+      traversal
+        .in[TaskLog]
+        .in[ShareTask]
+        .out[ShareCase]
+        .v[Case]
+
+    def can(permission: Permission)(implicit authContext: AuthContext): Traversal.V[Log] =
+      if (authContext.permissions.contains(permission))
+        traversal.filter(
+          _.in[TaskLog]
+            .in[ShareTask]
+            .filter(_.out[ShareProfile].has("permissions", permission))
+            .in[OrganisationShare]
+            .has("name", authContext.organisation)
+        )
+      else
+        traversal.limit(0)
+
+    def richLog =
+      traversal
+        .project(
+          _.by
+            .by(_.attachments.v[Attachment].fold)
+        )
+        .domainMap {
+          case (log, attachments) =>
+            RichLog(
+              log,
+              attachments
+            )
+        }
+
+    def richLogWithCustomRenderer[D, G, C <: Converter[D, G]](
+        entityRenderer: Traversal.V[Log] => Traversal[D, G, C]
+    ) =
+      traversal
+        .project(
+          _.by
+            .by(_.attachments.v[Attachment].fold)
+            .by(entityRenderer)
+        )
+        .domainMap {
+          case (log, attachments, renderedEntity) =>
+            RichLog(
+              log,
+              attachments
+            ) -> renderedEntity
+        }
+  }
 }
diff --git a/thehive/app/org/thp/thehive/services/ObservableSrv.scala b/thehive/app/org/thp/thehive/services/ObservableSrv.scala
index 7d17e146e7..2118689043 100644
--- a/thehive/app/org/thp/thehive/services/ObservableSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ObservableSrv.scala
@@ -1,22 +1,23 @@
 package org.thp.thehive.services
 
-import java.util.{Set => JSet}
+import java.util.{Map => JMap}
 
-import gremlin.scala.{KeyValue => _, _}
 import javax.inject.{Inject, Named, Provider, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.{P => JP}
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.thp.scalligraph.RichSeq
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
-import org.thp.scalligraph.{EntitySteps, RichSeq}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
 import org.thp.thehive.models._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.ShareOps._
 import play.api.libs.json.JsObject
 
-import scala.collection.JavaConverters._
 import scala.util.Try
 
 @Singleton
@@ -28,9 +29,9 @@ class ObservableSrv @Inject() (
     caseSrvProvider: Provider[CaseSrv],
     auditSrv: AuditSrv,
     alertSrvProvider: Provider[AlertSrv]
-)(
-    implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[Observable, ObservableSteps] {
+)(implicit
+    @Named("with-thehive-schema") db: Database
+) extends VertexSrv[Observable] {
   lazy val caseSrv: CaseSrv    = caseSrvProvider.get
   lazy val alertSrv: AlertSrv  = alertSrvProvider.get
   val observableKeyValueSrv    = new EdgeSrv[ObservableKeyValue, Observable, KeyValue]
@@ -39,10 +40,8 @@ class ObservableSrv @Inject() (
   val observableAttachmentSrv  = new EdgeSrv[ObservableAttachment, Observable, Attachment]
   val observableTagSrv         = new EdgeSrv[ObservableTag, Observable, Tag]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ObservableSteps = new ObservableSteps(raw)
-
-  def create(observable: Observable, `type`: ObservableType with Entity, file: FFile, tagNames: Set[String], extensions: Seq[KeyValue])(
-      implicit graph: Graph,
+  def create(observable: Observable, `type`: ObservableType with Entity, file: FFile, tagNames: Set[String], extensions: Seq[KeyValue])(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichObservable] =
     attachmentSrv.create(file).flatMap { attachment =>
@@ -55,8 +54,8 @@ class ObservableSrv @Inject() (
       attachment: Attachment with Entity,
       tagNames: Set[String],
       extensions: Seq[KeyValue]
-  )(
-      implicit graph: Graph,
+  )(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichObservable] =
     tagNames.toTry(tagSrv.getOrCreate).flatMap(tags => create(observable, `type`, attachment, tags, extensions))
@@ -67,8 +66,8 @@ class ObservableSrv @Inject() (
       attachment: Attachment with Entity,
       tags: Seq[Tag with Entity],
       extensions: Seq[KeyValue]
-  )(
-      implicit graph: Graph,
+  )(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichObservable] =
     for {
@@ -79,8 +78,8 @@ class ObservableSrv @Inject() (
       ext               <- addExtensions(createdObservable, extensions)
     } yield RichObservable(createdObservable, `type`, None, Some(attachment), tags, None, ext, Nil)
 
-  def create(observable: Observable, `type`: ObservableType with Entity, dataValue: String, tagNames: Set[String], extensions: Seq[KeyValue])(
-      implicit graph: Graph,
+  def create(observable: Observable, `type`: ObservableType with Entity, dataValue: String, tagNames: Set[String], extensions: Seq[KeyValue])(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichObservable] =
     for {
@@ -95,8 +94,8 @@ class ObservableSrv @Inject() (
       data: Data with Entity,
       tags: Seq[Tag with Entity],
       extensions: Seq[KeyValue]
-  )(
-      implicit graph: Graph,
+  )(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichObservable] =
     for {
@@ -110,7 +109,7 @@ class ObservableSrv @Inject() (
   def addTags(observable: Observable with Entity, tags: Set[String])(implicit graph: Graph, authContext: AuthContext): Try[Seq[Tag with Entity]] = {
     val currentTags = get(observable)
       .tags
-      .toList
+      .toSeq
       .map(_.toString)
       .toSet
     for {
@@ -120,8 +119,8 @@ class ObservableSrv @Inject() (
     } yield createdTags
   }
 
-  private def addExtensions(observable: Observable with Entity, extensions: Seq[KeyValue])(
-      implicit graph: Graph,
+  private def addExtensions(observable: Observable with Entity, extensions: Seq[KeyValue])(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[Seq[KeyValue with Entity]] =
     for {
@@ -147,8 +146,8 @@ class ObservableSrv @Inject() (
     } yield ()
   }
 
-  def duplicate(richObservable: RichObservable)(
-      implicit graph: Graph,
+  def duplicate(richObservable: RichObservable)(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichObservable] =
     for {
@@ -160,7 +159,7 @@ class ObservableSrv @Inject() (
     } yield richObservable.copy(observable = createdObservable)
 
   def remove(observable: Observable with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-    get(observable).alert.headOption() match {
+    get(observable).alert.headOption match {
       case None =>
         get(observable)
           .shares
@@ -176,194 +175,190 @@ class ObservableSrv @Inject() (
     }
 
   override def update(
-      steps: ObservableSteps,
+      traversal: Traversal.V[Observable],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(ObservableSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Observable], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (observableSteps, updatedFields) =>
         for {
-          observable <- observableSteps.getOrFail()
+          observable <- observableSteps.getOrFail("Observable")
           _          <- auditSrv.observable.update(observable, updatedFields)
         } yield ()
     }
 }
 
-@EntitySteps[Observable]
-class ObservableSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[Observable](raw) {
+object ObservableOps {
 
-  def filterOnType(`type`: String): ObservableSteps =
-    this.filter(_.outTo[ObservableObservableType].has("name", `type`))
+  implicit class ObservableOpsDefs(traversal: Traversal.V[Observable]) {
 
-  def filterOnData(data: String): ObservableSteps =
-    this.filter(_.outTo[ObservableData].has("data", data))
+    def filterOnType(`type`: String): Traversal.V[Observable] =
+      traversal.filter(_.out[ObservableObservableType].has("name", `type`))
 
-  def filterOnAttachmentName(name: String): ObservableSteps =
-    this.filter(_.outTo[ObservableAttachment].has("name", name))
+    def filterOnData(data: String): Traversal.V[Observable] =
+      traversal.filter(_.out[ObservableData].has("data", data))
 
-  def filterOnAttachmentSize(size: Long): ObservableSteps =
-    this.filter(_.outTo[ObservableAttachment].has("size", size))
+    def filterOnAttachmentName(name: String): Traversal.V[Observable] =
+      traversal.filter(_.out[ObservableAttachment].has("name", name))
 
-  def filterOnAttachmentContentType(contentType: String): ObservableSteps =
-    this.filter(_.outTo[ObservableAttachment].has("contentType", contentType))
+    def filterOnAttachmentSize(size: Long): Traversal.V[Observable] =
+      traversal.filter(_.out[ObservableAttachment].has("size", size))
 
-  def filterOnAttachmentHash(hash: String): ObservableSteps =
-    this.filter(_.outTo[ObservableAttachment].has("hashes", hash))
+    def filterOnAttachmentContentType(contentType: String): Traversal.V[Observable] =
+      traversal.filter(_.out[ObservableAttachment].has("contentType", contentType))
 
-  def visible(implicit authContext: AuthContext): ObservableSteps =
-    this.filter(_.inTo[ShareObservable].inTo[OrganisationShare].has("name", authContext.organisation))
+    def filterOnAttachmentHash(hash: String): Traversal.V[Observable] =
+      traversal.filter(_.out[ObservableAttachment].has("hashes", hash))
 
-  def can(permission: Permission)(implicit authContext: AuthContext): ObservableSteps =
-    if (authContext.permissions.contains(permission))
-      this.filter(
-        _.inTo[ShareObservable]
-          .filter(_.outTo[ShareProfile].has("permissions", permission))
-          .inTo[OrganisationShare]
-          .has("name", authContext.organisation)
-      )
-    else
-      this.limit(0)
+    def visible(implicit authContext: AuthContext): Traversal.V[Observable] =
+      traversal.filter(_.in[ShareObservable].in[OrganisationShare].has("name", authContext.organisation))
 
-  def userPermissions(implicit authContext: AuthContext): Traversal[Set[Permission], Set[Permission]] =
-    this
-      .share(authContext.organisation)
-      .profile
-      .map(profile => profile.permissions & authContext.permissions)
+    def can(permission: Permission)(implicit authContext: AuthContext): Traversal.V[Observable] =
+      if (authContext.permissions.contains(permission))
+        traversal.filter(
+          _.in[ShareObservable]
+            .filter(_.out[ShareProfile].has("permissions", permission))
+            .in[OrganisationShare]
+            .has("name", authContext.organisation)
+        )
+      else
+        traversal.limit(0)
 
-  def organisations = new OrganisationSteps(raw.inTo[ShareObservable].inTo[OrganisationShare])
+    def userPermissions(implicit authContext: AuthContext): Traversal[Set[Permission], Vertex, Converter[Set[Permission], Vertex]] =
+      traversal
+        .share(authContext.organisation)
+        .profile
+        .domainMap(profile => profile.permissions & authContext.permissions)
 
-  def origin: OrganisationSteps = new OrganisationSteps(raw.inTo[ShareObservable].has(Key("owner") of true).inTo[OrganisationShare])
+    def organisations: Traversal.V[Organisation] = traversal.in[ShareObservable].in[OrganisationShare].v[Organisation]
 
-  override def newInstance(): ObservableSteps = new ObservableSteps(raw.clone())
+    def origin: Traversal.V[Organisation] = traversal.in[ShareObservable].has("owner", true).in[OrganisationShare].v[Organisation]
 
-  def richObservable: Traversal[RichObservable, RichObservable] =
-    Traversal(
-      raw
+    def richObservable: Traversal[RichObservable, JMap[String, Any], Converter[RichObservable, JMap[String, Any]]] =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[ObservableObservableType].fold))
-            .and(By(__[Vertex].outTo[ObservableData].fold))
-            .and(By(__[Vertex].outTo[ObservableAttachment].fold))
-            .and(By(__[Vertex].outTo[ObservableTag].fold))
-            .and(By(__[Vertex].outTo[ObservableKeyValue].fold))
-            .and(By(__[Vertex].outTo[ObservableReportTag].fold))
+          _.by
+            .by(_.out[ObservableObservableType].v[ObservableType].fold)
+            .by(_.out[ObservableData].v[Data].fold)
+            .by(_.out[ObservableAttachment].v[Attachment].fold)
+            .by(_.out[ObservableTag].v[Tag].fold)
+            .by(_.out[ObservableKeyValue].v[KeyValue].fold)
+            .by(_.out[ObservableReportTag].v[ReportTag].fold)
         )
-        .map {
+        .domainMap {
           case (observable, tpe, data, attachment, tags, extensions, reportTags) =>
             RichObservable(
-              observable.as[Observable],
-              onlyOneOf[Vertex](tpe).as[ObservableType],
-              atMostOneOf[Vertex](data).map(_.as[Data]),
-              atMostOneOf[Vertex](attachment).map(_.as[Attachment]),
-              tags.asScala.map(_.as[Tag]),
+              observable,
+              tpe.head,
+              data.headOption,
+              attachment.headOption,
+              tags,
               None,
-              extensions.asScala.map(_.as[KeyValue]),
-              reportTags.asScala.map(_.as[ReportTag])
+              extensions,
+              reportTags
             )
         }
-    )
 
-  def richObservableWithSeen(implicit authContext: AuthContext): Traversal[RichObservable, RichObservable] =
-    Traversal(
-      raw
+    def richObservableWithSeen(implicit
+        authContext: AuthContext
+    ): Traversal[RichObservable, JMap[String, Any], Converter[RichObservable, JMap[String, Any]]] =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[ObservableObservableType].fold))
-            .and(By(__[Vertex].outTo[ObservableData].fold))
-            .and(By(__[Vertex].outTo[ObservableAttachment].fold))
-            .and(By(__[Vertex].outTo[ObservableTag].fold))
-            .and(By(new ObservableSteps(__[Vertex]).similar.visible.raw.limit(1).count))
-            .and(By(__[Vertex].outTo[ObservableKeyValue].fold))
-            .and(By(__[Vertex].outTo[ObservableReportTag].fold))
+          _.by
+            .by(_.out[ObservableObservableType].v[ObservableType].fold)
+            .by(_.out[ObservableData].v[Data].fold)
+            .by(_.out[ObservableAttachment].v[Attachment].fold)
+            .by(_.out[ObservableTag].v[Tag].fold)
+            .by(_.similar.visible.limit(1).count)
+            .by(_.out[ObservableKeyValue].v[KeyValue].fold)
+            .by(_.out[ObservableReportTag].v[ReportTag].fold)
         )
-        .map {
+        .domainMap {
           case (observable, tpe, data, attachment, tags, count, extensions, reportTags) =>
             RichObservable(
-              observable.as[Observable],
-              onlyOneOf[Vertex](tpe).as[ObservableType],
-              atMostOneOf[Vertex](data).map(_.as[Data]),
-              atMostOneOf[Vertex](attachment).map(_.as[Attachment]),
-              tags.asScala.map(_.as[Tag]),
+              observable,
+              tpe.head,
+              data.headOption,
+              attachment.headOption,
+              tags,
               Some(count != 0),
-              extensions.asScala.map(_.as[KeyValue]),
-              reportTags.asScala.map(_.as[ReportTag])
+              extensions,
+              reportTags
             )
         }
-    )
 
-  def richObservableWithCustomRenderer[A](
-      entityRenderer: ObservableSteps => TraversalLike[_, A]
-  ): Traversal[(RichObservable, A), (RichObservable, A)] =
-    Traversal(
-      raw
+    def richObservableWithCustomRenderer[D, G, C <: Converter[D, G]](
+        entityRenderer: Traversal.V[Observable] => Traversal[D, G, C]
+    )(implicit authContext: AuthContext) =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[ObservableObservableType].fold))
-            .and(By(__[Vertex].outTo[ObservableData].fold))
-            .and(By(__[Vertex].outTo[ObservableAttachment].fold))
-            .and(By(__[Vertex].outTo[ObservableTag].fold))
-            .and(By(__[Vertex].outTo[ObservableKeyValue].fold))
-            .and(By(__[Vertex].outTo[ObservableReportTag].fold))
-            .and(By(entityRenderer(newInstance(__[Vertex])).raw))
+          _.by
+            .by(_.out[ObservableObservableType].v[ObservableType].fold)
+            .by(_.out[ObservableData].v[Data].fold)
+            .by(_.out[ObservableAttachment].v[Attachment].fold)
+            .by(_.out[ObservableTag].v[Tag].fold)
+            .by(_.similar.visible.limit(1).count)
+            .by(_.out[ObservableKeyValue].v[KeyValue].fold)
+            .by(_.out[ObservableReportTag].v[ReportTag].fold)
+            .by(entityRenderer)
         )
-        .map {
-          case (observable, tpe, data, attachment, tags, extensions, reportTags, renderedEntity) =>
+        .domainMap {
+          case (observable, tpe, data, attachment, tags, count, extensions, reportTags, renderedEntity) =>
             RichObservable(
-              observable.as[Observable],
-              onlyOneOf[Vertex](tpe).as[ObservableType],
-              atMostOneOf[Vertex](data).map(_.as[Data]),
-              atMostOneOf[Vertex](attachment).map(_.as[Attachment]),
-              tags.asScala.map(_.as[Tag]),
-              None,
-              extensions.asScala.map(_.as[KeyValue]),
-              reportTags.asScala.map(_.as[ReportTag])
+              observable,
+              tpe.head,
+              data.headOption,
+              attachment.headOption,
+              tags,
+              Some(count != 0),
+              extensions,
+              reportTags
             ) -> renderedEntity
         }
-    )
 
-  def `case`: CaseSteps = new CaseSteps(raw.inTo[ShareObservable].outTo[ShareCase])
+    def `case`: Traversal.V[Case] = traversal.in[ShareObservable].out[ShareCase].v[Case]
 
-  def alert: AlertSteps = new AlertSteps(raw.inTo[AlertObservable])
+    def alert: Traversal.V[Alert] = traversal.in[AlertObservable].v[Alert]
 
-  def tags: TagSteps = new TagSteps(raw.outTo[ObservableTag])
+    def tags: Traversal.V[Tag] = traversal.out[ObservableTag].v[Tag]
 
-  def reportTags: ReportTagSteps = new ReportTagSteps(raw.outTo[ObservableReportTag])
+    def reportTags: Traversal.V[ReportTag] = traversal.out[ObservableReportTag].v[ReportTag]
 
-  def removeTags(tags: Set[Tag with Entity]): Unit =
-    if (tags.nonEmpty)
-      this.outToE[ObservableTag].filter(_.otherV().hasId(tags.map(_._id).toSeq: _*)).remove()
+    def removeTags(tags: Set[Tag with Entity]): Unit =
+      if (tags.nonEmpty)
+        traversal.outE[ObservableTag].filter(_.otherV.hasId(tags.map(_._id).toSeq: _*)).remove()
 
-  def similar: ObservableSteps = {
-    val originLabel = StepLabel[JSet[Vertex]]()
-    newInstance(
-      raw
+    def similar: Traversal.V[Observable] = {
+      val originLabel = StepLabel.v[Observable]
+      traversal
         .aggregate(originLabel)
         .unionFlat(
-          _.outTo[ObservableData]
-            .inTo[ObservableData],
-          _.outTo[ObservableAttachment]
-            .inTo[ObservableAttachment]
+          _.out[ObservableData]
+            .in[ObservableData],
+          _.out[ObservableAttachment]
+            .in[ObservableAttachment]
         )
         .where(JP.without(originLabel.name))
         .dedup
-    )
-  }
+        .v[Observable]
+    }
+
+    def data: Traversal.V[Data] = traversal.out[ObservableData].v[Data]
+
+    def attachments: Traversal.V[Attachment] = traversal.out[ObservableAttachment].v[Attachment]
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): ObservableSteps = new ObservableSteps(newRaw)
+    def keyValues: Traversal.V[KeyValue] = traversal.out[ObservableKeyValue].v[KeyValue]
 
-  def data           = new DataSteps(raw.outTo[ObservableData])
-  def attachments    = new AttachmentSteps(raw.outTo[ObservableAttachment])
-  def keyValues      = new KeyValueSteps(raw.outTo[ObservableKeyValue])
-  def observableType = new ObservableTypeSteps(raw.outTo[ObservableObservableType])
+    def observableType: Traversal.V[ObservableType] = traversal.out[ObservableObservableType].v[ObservableType]
 
-  def shares: ShareSteps = new ShareSteps(raw.inTo[ShareObservable])
+    def shares: Traversal.V[Share] = traversal.in[ShareObservable].v[Share]
 
-  def share(implicit authContext: AuthContext): ShareSteps = share(authContext.organisation)
+    def share(implicit authContext: AuthContext): Traversal.V[Share] = share(authContext.organisation)
+
+    def share(organistionName: String): Traversal.V[Share] =
+      traversal
+        .in[ShareObservable]
+        .filter(_.in[OrganisationShare].has("name", organistionName))
+        .v[Share]
+  }
 
-  def share(organistionName: String): ShareSteps =
-    new ShareSteps(
-      raw
-        .inTo[ShareObservable]
-        .filter(_.inTo[OrganisationShare].has(Key("name") of organistionName))
-    )
 }
diff --git a/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala b/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
index cbe4fefb24..8a04db480f 100644
--- a/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
@@ -1,31 +1,31 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
-import org.thp.scalligraph.{BadRequestError, CreateError, EntitySteps}
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.{BadRequestError, CreateError}
 import org.thp.thehive.models._
+import org.thp.thehive.services.ObservableTypeOps._
 
 import scala.util.{Failure, Success, Try}
 
 @Singleton
 class ObservableTypeSrv @Inject() (@Named("integrity-check-actor") integrityCheckActor: ActorRef)(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[ObservableType, ObservableTypeSteps] {
+) extends VertexSrv[ObservableType] {
 
-  val observableObservableTypeSrv                                                           = new EdgeSrv[ObservableObservableType, Observable, ObservableType]
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ObservableTypeSteps = new ObservableTypeSteps(raw)
+  val observableObservableTypeSrv = new EdgeSrv[ObservableObservableType, Observable, ObservableType]
 
-  override def get(idOrName: String)(implicit graph: Graph): ObservableTypeSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[ObservableType] =
     if (db.isValidId(idOrName)) getByIds(idOrName)
-    else initSteps.getByName(idOrName)
+    else startTraversal.getByName(idOrName)
 
-  override def exists(e: ObservableType)(implicit graph: Graph): Boolean = initSteps.getByName(e.name).exists()
+  override def exists(e: ObservableType)(implicit graph: Graph): Boolean = startTraversal.getByName(e.name).exists
 
   override def createEntity(e: ObservableType)(implicit graph: Graph, authContext: AuthContext): Try[ObservableType with Entity] = {
     integrityCheckActor ! IntegrityCheckActor.EntityAdded("ObservableType")
@@ -43,26 +43,24 @@ class ObservableTypeSrv @Inject() (@Named("integrity-check-actor") integrityChec
     else Failure(BadRequestError(s"Observable type $idOrName is used"))
 
   def useCount(idOrName: String)(implicit graph: Graph): Long =
-    get(idOrName).inTo[ObservableObservableType].getCount
+    get(idOrName).in[ObservableObservableType].getCount
 }
 
-@EntitySteps[ObservableType]
-class ObservableTypeSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[ObservableType](raw) {
+object ObservableTypeOps {
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): ObservableTypeSteps = new ObservableTypeSteps(newRaw)
-  override def newInstance(): ObservableTypeSteps                             = new ObservableTypeSteps(raw.clone())
+  implicit class ObservableTypeObs(traversal: Traversal.V[ObservableType]) {
 
-  def get(idOrName: String): ObservableTypeSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
+    def get(idOrName: String)(implicit db: Database): Traversal.V[ObservableType] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
-  def getByName(name: String): ObservableTypeSteps = new ObservableTypeSteps(raw.has(Key("name") of name))
+    def getByName(name: String): Traversal.V[ObservableType] = traversal.has("name", name).v[ObservableType]
+  }
 }
 
 class ObservableTypeIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: ObservableTypeSrv)
     extends IntegrityCheckOps[ObservableType] {
-  override def resolve(entities: List[ObservableType with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[ObservableType with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
index 48cb63af6e..3e44789bb9 100644
--- a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
+++ b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
@@ -1,20 +1,21 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
-import org.thp.scalligraph.{BadRequestError, EntitySteps, RichSeq}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.{BadRequestError, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.RoleOps._
 import play.api.libs.json.JsObject
 
-import scala.collection.JavaConverters._
 import scala.util.{Failure, Success, Try}
 
 @Singleton
@@ -25,13 +26,11 @@ class OrganisationSrv @Inject() (
     @Named("integrity-check-actor") integrityCheckActor: ActorRef
 )(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[Organisation, OrganisationSteps] {
+) extends VertexSrv[Organisation] {
 
   val organisationOrganisationSrv = new EdgeSrv[OrganisationOrganisation, Organisation, Organisation]
   val organisationShareSrv        = new EdgeSrv[OrganisationShare, Organisation, Share]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): OrganisationSteps = new OrganisationSteps(raw)
-
   override def createEntity(e: Organisation)(implicit graph: Graph, authContext: AuthContext): Try[Organisation with Entity] = {
     integrityCheckActor ! IntegrityCheckActor.EntityAdded("Organisation")
     super.createEntity(e)
@@ -49,32 +48,32 @@ class OrganisationSrv @Inject() (
       _                   <- auditSrv.organisation.create(createdOrganisation, createdOrganisation.toJson)
     } yield createdOrganisation
 
-  def current(implicit graph: Graph, authContext: AuthContext): OrganisationSteps = get(authContext.organisation)
+  def current(implicit graph: Graph, authContext: AuthContext): Traversal.V[Organisation] = get(authContext.organisation)
 
-  override def get(idOrName: String)(implicit graph: Graph): OrganisationSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[Organisation] =
     if (db.isValidId(idOrName)) getByIds(idOrName)
-    else initSteps.getByName(idOrName)
+    else startTraversal.getByName(idOrName)
 
-  override def exists(e: Organisation)(implicit graph: Graph): Boolean = initSteps.getByName(e.name).exists()
+  override def exists(e: Organisation)(implicit graph: Graph): Boolean = startTraversal.getByName(e.name).exists
 
   override def update(
-      steps: OrganisationSteps,
+      traversal: Traversal.V[Organisation],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(OrganisationSteps, JsObject)] =
-    if (steps.newInstance().has("name", Organisation.administration.name).exists())
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Organisation], JsObject)] =
+    if (traversal.clone().has("name", Organisation.administration.name).exists)
       Failure(BadRequestError("Admin organisation is unmodifiable"))
     else {
-      auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+      auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
         case (orgSteps, updatedFields) =>
           orgSteps
-            .newInstance()
+            .clone()
             .getOrFail("Organisation")
             .flatMap(auditSrv.organisation.update(_, updatedFields))
       }
     }
 
   def linkExists(fromOrg: Organisation with Entity, toOrg: Organisation with Entity)(implicit graph: Graph): Boolean =
-    fromOrg._id == toOrg._id || get(fromOrg).links.hasId(toOrg._id).exists()
+    fromOrg._id == toOrg._id || get(fromOrg).links.hasId(toOrg._id).exists
 
   def link(fromOrg: Organisation with Entity, toOrg: Organisation with Entity)(implicit authContext: AuthContext, graph: Graph): Try[Unit] =
     if (linkExists(fromOrg, toOrg)) Success(())
@@ -91,8 +90,8 @@ class OrganisationSrv @Inject() (
   def unlink(fromOrg: Organisation with Entity, toOrg: Organisation with Entity)(implicit graph: Graph): Try[Unit] =
     Success(
       get(fromOrg)
-        .outToE[OrganisationOrganisation]
-        .filter(_.otherV().hasId(toOrg._id))
+        .outE[OrganisationOrganisation]
+        .filter(_.otherV.hasId(toOrg._id))
         .remove()
     )
 
@@ -104,7 +103,7 @@ class OrganisationSrv @Inject() (
   def updateLink(fromOrg: Organisation with Entity, toOrganisations: Seq[String])(implicit authContext: AuthContext, graph: Graph): Try[Unit] = {
     val (orgToAdd, orgToRemove) = get(fromOrg)
       .links
-      .name
+      .property[String, String]("name", identity[String])
       .toIterator
       .foldLeft((toOrganisations.toSet, Set.empty[String])) {
         case ((toAdd, toRemove), o) if toAdd.contains(o) => (toAdd - o, toRemove)
@@ -117,87 +116,85 @@ class OrganisationSrv @Inject() (
   }
 }
 
-@EntitySteps[Organisation]
-class OrganisationSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[Organisation](raw) {
+object OrganisationOps {
 
-  def links: OrganisationSteps = newInstance(raw.outTo[OrganisationOrganisation])
+  implicit class OrganisationOpsDefs(traversal: Traversal.V[Organisation]) {
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): OrganisationSteps = new OrganisationSteps(newRaw)
+    def links: Traversal.V[Organisation] = traversal.out[OrganisationOrganisation].v[Organisation]
 
-  def cases: CaseSteps = new CaseSteps(raw.outTo[OrganisationShare].outTo[ShareCase])
+    def cases: Traversal.V[Case] = traversal.out[OrganisationShare].out[ShareCase].v[Case]
 
-  def shares: ShareSteps = new ShareSteps(raw.outTo[OrganisationShare])
+    def shares: Traversal.V[Share] = traversal.out[OrganisationShare].v[Share]
 
-  def caseTemplates: CaseTemplateSteps = new CaseTemplateSteps(raw.inTo[CaseTemplateOrganisation])
+    def caseTemplates: Traversal.V[CaseTemplate] = traversal.in[CaseTemplateOrganisation].v[CaseTemplate]
 
-  def users(requiredPermission: Permission): UserSteps = new UserSteps(
-    raw
-      .inTo[RoleOrganisation]
-      .filter(_.outTo[RoleProfile].has(Key("permissions") of requiredPermission))
-      .inTo[UserRole]
-  )
+    def users(requiredPermission: Permission): Traversal.V[User] =
+      traversal
+        .in[RoleOrganisation]
+        .filter(_.out[RoleProfile].has("permissions", requiredPermission))
+        .in[UserRole]
+        .v[User]
 
-  def userPermissions(userId: String): Traversal[Permission, String] =
-    this
-      .roles
-      .filter(_.user.has("login", userId))
-      .profile
-      .permissions
+    def userPermissions(userId: String): Traversal[Permission, String, Converter[Permission, String]] =
+      traversal
+        .roles
+        .filter(_.user.has("login", userId))
+        .profile
+        .property("permissions", Permission(_: String))
 
-  def roles: RoleSteps = new RoleSteps(raw.inTo[RoleOrganisation])
+    def roles: Traversal.V[Role] = traversal.in[RoleOrganisation].v[Role]
 
-  def pages: PageSteps = new PageSteps(raw.outTo[OrganisationPage])
+    def pages: Traversal.V[Page] = traversal.out[OrganisationPage].v[Page]
 
-  def alerts: AlertSteps = new AlertSteps(raw.inTo[AlertOrganisation])
+    def alerts: Traversal.V[Alert] = traversal.in[AlertOrganisation].v[Alert]
 
-  def dashboards: DashboardSteps = new DashboardSteps(raw.outTo[OrganisationDashboard])
+    def dashboards: Traversal.V[Dashboard] = traversal.out[OrganisationDashboard].v[Dashboard]
 
-  def visible(implicit authContext: AuthContext): OrganisationSteps =
-    if (authContext.isPermitted(Permissions.manageOrganisation)) this
-    else
-      this.filter(_.visibleOrganisationsTo.users.has("login", authContext.userId))
-
-  def richOrganisation: Traversal[RichOrganisation, RichOrganisation] =
-    this
-      .project(
-        _.by
-          .by(_.outTo[OrganisationOrganisation].fold)
-      )
-      .map {
-        case (organisation, linkedOrganisations) =>
-          RichOrganisation(organisation.as[Organisation], linkedOrganisations.asScala.map(_.as[Organisation]))
-      }
+    def visible(implicit authContext: AuthContext): Traversal.V[Organisation] =
+      if (authContext.isPermitted(Permissions.manageOrganisation)) traversal
+      else
+        traversal.filter(_.visibleOrganisationsTo.users.has("login", authContext.userId))
 
-  def users: UserSteps = new UserSteps(raw.inTo[RoleOrganisation].inTo[UserRole])
+    def richOrganisation =
+      traversal
+        .project(
+          _.by
+            .by(_.out[OrganisationOrganisation].v[Organisation].fold)
+        )
+        .domainMap {
+          case (organisation, linkedOrganisations) =>
+            RichOrganisation(organisation, linkedOrganisations)
+        }
 
-  def userProfile(login: String): ProfileSteps =
-    new ProfileSteps(
-      this
-        .inTo[RoleOrganisation]
-        .filter(_.inTo[UserRole].has("login", login))
-        .outTo[RoleProfile]
-        .raw
-    )
+    def users: Traversal.V[User] = traversal.in[RoleOrganisation].in[UserRole].v[User]
+
+    def userProfile(login: String): Traversal.V[Profile] =
+      traversal
+        .in[RoleOrganisation]
+        .filter(_.in[UserRole].has("login", login))
+        .out[RoleProfile]
+        .v[Profile]
 
-  def visibleOrganisationsTo: OrganisationSteps = new OrganisationSteps(raw.unionFlat(_.identity(), _.inTo[OrganisationOrganisation]).dedup())
+    def visibleOrganisationsTo: Traversal.V[Organisation] =
+      traversal.unionFlat(identity, _.in[OrganisationOrganisation]).dedup().v[Organisation]
 
-  def visibleOrganisationsFrom: OrganisationSteps = new OrganisationSteps(raw.unionFlat(_.identity(), _.outTo[OrganisationOrganisation]).dedup())
+    def visibleOrganisationsFrom: Traversal.V[Organisation] =
+      traversal.unionFlat(identity, _.out[OrganisationOrganisation]).dedup().v[Organisation]
 
-  def config: ConfigSteps = new ConfigSteps(raw.outTo[OrganisationConfig])
+    def config: Traversal.V[Config] = traversal.out[OrganisationConfig].v[Config]
 
-  def get(idOrName: String): OrganisationSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
+    def get(idOrName: String)(implicit db: Database): Traversal.V[Organisation] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
-  def getByName(name: String): OrganisationSteps = this.has("name", name)
+    def getByName(name: String): Traversal.V[Organisation] = traversal.has("name", name)
+  }
 
-  override def newInstance(): OrganisationSteps = new OrganisationSteps(raw.clone())
 }
 
 class OrganisationIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: OrganisationSrv)
     extends IntegrityCheckOps[Organisation] {
-  override def resolve(entities: List[Organisation with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[Organisation with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/PageSrv.scala b/thehive/app/org/thp/thehive/services/PageSrv.scala
index b30b6177e1..d9152b1030 100644
--- a/thehive/app/org/thp/thehive/services/PageSrv.scala
+++ b/thehive/app/org/thp/thehive/services/PageSrv.scala
@@ -1,35 +1,33 @@
 package org.thp.thehive.services
 
-import gremlin.scala.{Graph, GremlinScala, Vertex}
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services.{EdgeSrv, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Organisation, OrganisationPage, Page}
+import org.thp.thehive.services.PageOps._
 import play.api.libs.json.Json
 
 import scala.util.Try
 
 @Singleton
 class PageSrv @Inject() (implicit @Named("with-thehive-schema") db: Database, organisationSrv: OrganisationSrv, auditSrv: AuditSrv)
-    extends VertexSrv[Page, PageSteps] {
+    extends VertexSrv[Page] {
 
   val organisationPageSrv = new EdgeSrv[OrganisationPage, Organisation, Page]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): PageSteps = new PageSteps(raw)
-
-  override def get(idOrSlug: String)(implicit graph: Graph): PageSteps =
+  override def get(idOrSlug: String)(implicit graph: Graph): Traversal.V[Page] =
     if (db.isValidId(idOrSlug)) getByIds(idOrSlug)
-    else initSteps.getBySlug(idOrSlug)
+    else startTraversal.getBySlug(idOrSlug)
 
   def create(page: Page)(implicit authContext: AuthContext, graph: Graph): Try[Page with Entity] =
     for {
       created      <- createEntity(page)
-      organisation <- organisationSrv.get(authContext.organisation).getOrFail()
+      organisation <- organisationSrv.get(authContext.organisation).getOrFail("Organisation")
       _            <- organisationPageSrv.create(OrganisationPage(), organisation, created)
       _            <- auditSrv.page.create(created, Json.obj("title" -> page.title))
     } yield created
@@ -37,7 +35,7 @@ class PageSrv @Inject() (implicit @Named("with-thehive-schema") db: Database, or
   def update(page: Page with Entity, propertyUpdaters: Seq[PropertyUpdater])(implicit graph: Graph, authContext: AuthContext): Try[Page with Entity] =
     for {
       updated <- update(get(page), propertyUpdaters)
-      p       <- updated._1.getOrFail()
+      p       <- updated._1.getOrFail("Page")
       _       <- auditSrv.page.update(p, Json.obj("title" -> p.title))
     } yield p
 
@@ -48,16 +46,18 @@ class PageSrv @Inject() (implicit @Named("with-thehive-schema") db: Database, or
     }
 }
 
-@EntitySteps[Page]
-class PageSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Page](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): PageSteps = new PageSteps(newRaw)
-  override def newInstance(): PageSteps                             = new PageSteps(raw.clone())
+object PageOps {
+
+  implicit class PageOpsDefs(traversal: Traversal.V[Page]) {
+
+    def getByTitle(title: String): Traversal.V[Page] = traversal.has("title", title)
+
+    def getBySlug(slug: String): Traversal.V[Page] = traversal.has("slug", slug)
 
-  def getByTitle(title: String): PageSteps = this.has("title", title)
-  def getBySlug(slug: String): PageSteps   = this.has("slug", slug)
+    def visible(implicit authContext: AuthContext): Traversal.V[Page] = traversal.filter(
+      _.in[OrganisationPage]
+        .has("name", authContext.organisation)
+    )
+  }
 
-  def visible(implicit authContext: AuthContext): PageSteps = this.filter(
-    _.inTo[OrganisationPage]
-      .has("name", authContext.organisation)
-  )
 }
diff --git a/thehive/app/org/thp/thehive/services/ProfileSrv.scala b/thehive/app/org/thp/thehive/services/ProfileSrv.scala
index 39367b2f73..0f57dca461 100644
--- a/thehive/app/org/thp/thehive/services/ProfileSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ProfileSrv.scala
@@ -1,17 +1,18 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Provider, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
+import org.thp.scalligraph.BadRequestError
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
-import org.thp.scalligraph.{BadRequestError, EntitySteps}
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.ProfileOps._
 import play.api.libs.json.JsObject
 
 import scala.util.{Failure, Success, Try}
@@ -23,7 +24,7 @@ class ProfileSrv @Inject() (
     @Named("integrity-check-actor") integrityCheckActor: ActorRef
 )(
     implicit @Named("with-thehive-schema") val db: Database
-) extends VertexSrv[Profile, ProfileSteps] {
+) extends VertexSrv[Profile] {
   lazy val organisationSrv: OrganisationSrv = organisationSrvProvider.get
   lazy val orgAdmin: Profile with Entity    = db.roTransaction(graph => getOrFail(Profile.orgAdmin.name)(graph)).get
 
@@ -38,18 +39,16 @@ class ProfileSrv @Inject() (
       _              <- auditSrv.profile.create(createdProfile, createdProfile.toJson)
     } yield createdProfile
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ProfileSteps = new ProfileSteps(raw)
-
-  override def get(idOrName: String)(implicit graph: Graph): ProfileSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[Profile] =
     if (db.isValidId(idOrName)) getByIds(idOrName)
-    else initSteps.getByName(idOrName)
+    else startTraversal.getByName(idOrName)
 
-  override def exists(e: Profile)(implicit graph: Graph): Boolean = initSteps.getByName(e.name).exists()
+  override def exists(e: Profile)(implicit graph: Graph): Boolean = startTraversal.getByName(e.name).exists
 
   def remove(profile: Profile with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     if (!profile.isEditable)
       Failure(BadRequestError(s"Profile ${profile.name} cannot be removed"))
-    else if (get(profile).filter(_.or(_.roles, _.shares)).exists())
+    else if (get(profile).filter(_.or(_.roles, _.shares)).exists)
       Failure(BadRequestError(s"Profile ${profile.name} is used"))
     else
       organisationSrv.getOrFail(authContext.organisation).flatMap { organisation =>
@@ -58,36 +57,37 @@ class ProfileSrv @Inject() (
       }
 
   override def update(
-      steps: ProfileSteps,
+      traversal: Traversal.V[Profile],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(ProfileSteps, JsObject)] =
-    if (steps.newInstance().toIterator.exists(!_.isEditable))
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Profile], JsObject)] =
+    if (traversal.clone().toIterator.exists(!_.isEditable))
       Failure(BadRequestError(s"Profile is not editable"))
-    else super.update(steps, propertyUpdaters)
+    else super.update(traversal, propertyUpdaters)
 }
 
-@EntitySteps[Profile]
-class ProfileSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Profile](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): ProfileSteps = new ProfileSteps(newRaw)
-  override def newInstance(): ProfileSteps                             = new ProfileSteps(raw.clone())
+object ProfileOps {
+
+  implicit class ProfileOpsDefs(traversal: Traversal.V[Profile]) {
 
-  def roles = new RoleSteps(raw.inTo[RoleProfile])
+    def roles: Traversal.V[Role] = traversal.in[RoleProfile].v[Role]
 
-  def shares = new ShareSteps(raw.inTo[ShareProfile])
+    def shares: Traversal.V[Share] = traversal.in[ShareProfile].v[Share]
 
-  def get(idOrName: String): ProfileSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
+    def get(idOrName: String)(implicit db: Database): Traversal.V[Profile] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
-  def getByName(name: String): ProfileSteps = new ProfileSteps(raw.has(Key("name") of name))
+    def getByName(name: String): Traversal.V[Profile] = traversal.has("name", name)
+
+    def contains(permission: Permission): Traversal.V[Profile] =
+      traversal.has("permissions", permission)
+  }
 
-  def contains(permission: Permission): ProfileSteps =
-    this.has("permissions", permission)
 }
 
 class ProfileIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: ProfileSrv)
     extends IntegrityCheckOps[Profile] {
-  override def resolve(entities: List[Profile with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[Profile with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/ReportTagSrv.scala b/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
index 2bea03f41d..c22e009eaf 100644
--- a/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
@@ -1,24 +1,23 @@
 package org.thp.thehive.services
 
-import gremlin.scala.{Graph, GremlinScala, Vertex}
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.RichSeq
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
-import org.thp.scalligraph.services.{EdgeSrv, RichVertexGremlinScala, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
+import org.thp.scalligraph.services.{EdgeSrv, VertexSrv}
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Observable, ObservableReportTag, ReportTag}
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.ReportTagOps._
 
 import scala.util.Try
 
 @Singleton
-class ReportTagSrv @Inject() (observableSrv: ObservableSrv)(implicit @Named("with-thehive-schema") db: Database)
-    extends VertexSrv[ReportTag, ReportTagSteps] {
+class ReportTagSrv @Inject() (observableSrv: ObservableSrv)(implicit @Named("with-thehive-schema") db: Database) extends VertexSrv[ReportTag] {
   val observableReportTagSrv = new EdgeSrv[ObservableReportTag, Observable, ReportTag]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ReportTagSteps = new ReportTagSteps(raw)
-
   def updateTags(observable: Observable with Entity, origin: String, reportTags: Seq[ReportTag])(
       implicit graph: Graph,
       authContext: AuthContext
@@ -32,11 +31,10 @@ class ReportTagSrv @Inject() (observableSrv: ObservableSrv)(implicit @Named("wit
   }
 }
 
-class ReportTagSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[ReportTag](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): VertexSteps[ReportTag] = new ReportTagSteps(raw)
-
-  def observable: ObservableSteps = new ObservableSteps(raw.inTo[ObservableReportTag])
+object ReportTagOps {
+  implicit class ReportTagOpsDefs(traversal: Traversal.V[ReportTag]) {
+    def observable: Traversal.V[Observable] = traversal.in[ObservableReportTag].v[Observable]
 
-  def fromOrigin(origin: String): ReportTagSteps = this.has("origin", origin)
+    def fromOrigin(origin: String): Traversal.V[ReportTag] = traversal.has("origin", origin)
+  }
 }
diff --git a/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala b/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
index 243fac9956..1546f87451 100644
--- a/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
@@ -1,28 +1,27 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.{CreateError, EntitySteps}
+import org.apache.tinkerpop.gremlin.structure.Graph
+import org.thp.scalligraph.CreateError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.{IntegrityCheckOps, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.VertexSteps
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.ResolutionStatus
+import org.thp.thehive.services.ResolutionStatusOps._
 
 import scala.util.{Failure, Success, Try}
 
 @Singleton
 class ResolutionStatusSrv @Inject() (@Named("integrity-check-actor") integrityCheckActor: ActorRef)(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[ResolutionStatus, ResolutionStatusSteps] {
+) extends VertexSrv[ResolutionStatus] {
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ResolutionStatusSteps = new ResolutionStatusSteps(raw)
-
-  override def get(idOrName: String)(implicit graph: Graph): ResolutionStatusSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[ResolutionStatus] =
     if (db.isValidId(idOrName)) getByIds(idOrName)
-    else initSteps.getByName(idOrName)
+    else startTraversal.getByName(idOrName)
 
   override def createEntity(e: ResolutionStatus)(implicit graph: Graph, authContext: AuthContext): Try[ResolutionStatus with Entity] = {
     integrityCheckActor ! IntegrityCheckActor.EntityAdded("Resolution")
@@ -35,27 +34,22 @@ class ResolutionStatusSrv @Inject() (@Named("integrity-check-actor") integrityCh
     else
       createEntity(resolutionStatus)
 
-  override def exists(e: ResolutionStatus)(implicit graph: Graph): Boolean = initSteps.getByName(e.value).exists()
+  override def exists(e: ResolutionStatus)(implicit graph: Graph): Boolean = startTraversal.getByName(e.value).exists
 }
 
-@EntitySteps[ResolutionStatus]
-class ResolutionStatusSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph)
-    extends VertexSteps[ResolutionStatus](raw) {
-
-  override def newInstance(newRaw: GremlinScala[Vertex]): ResolutionStatusSteps = new ResolutionStatusSteps(newRaw)
-  override def newInstance(): ResolutionStatusSteps                             = new ResolutionStatusSteps(raw.clone())
-
-  def get(idOrName: String): ResolutionStatusSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
-
-  def getByName(name: String): ResolutionStatusSteps = new ResolutionStatusSteps(raw.has(Key("value") of name))
+object ResolutionStatusOps {
+  implicit class ResolutionStatusOpsDefs(traversal: Traversal.V[ResolutionStatus]) {
+    def get(idOrName: String)(implicit db: Database): Traversal.V[ResolutionStatus] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
+    def getByName(name: String): Traversal.V[ResolutionStatus] = traversal.has("value", name).v[ResolutionStatus]
+  }
 }
 
 class ResolutionStatusIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: ResolutionStatusSrv)
     extends IntegrityCheckOps[ResolutionStatus] {
-  override def resolve(entities: List[ResolutionStatus with Entity])(implicit graph: Graph): Try[Unit] = entities match {
+  override def resolve(entities: Seq[ResolutionStatus with Entity])(implicit graph: Graph): Try[Unit] = entities match {
     case head :: tail =>
       tail.foreach(copyEdge(_, head))
       service.getByIds(tail.map(_._id): _*).remove()
diff --git a/thehive/app/org/thp/thehive/services/RoleSrv.scala b/thehive/app/org/thp/thehive/services/RoleSrv.scala
index c882d39ee5..c4178722d2 100644
--- a/thehive/app/org/thp/thehive/services/RoleSrv.scala
+++ b/thehive/app/org/thp/thehive/services/RoleSrv.scala
@@ -1,25 +1,24 @@
 package org.thp.thehive.services
 
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.VertexSteps
+import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models._
+import org.thp.thehive.services.RoleOps._
 
 import scala.util.Try
 
 @Singleton
-class RoleSrv @Inject() (@Named("with-thehive-schema") implicit val db: Database) extends VertexSrv[Role, RoleSteps] {
+class RoleSrv @Inject() (@Named("with-thehive-schema") implicit val db: Database) extends VertexSrv[Role] {
 
   val roleOrganisationSrv = new EdgeSrv[RoleOrganisation, Role, Organisation]
   val userRoleSrv         = new EdgeSrv[UserRole, User, Role]
   val roleProfileSrv      = new EdgeSrv[RoleProfile, Role, Profile]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): RoleSteps = new RoleSteps(raw)
-
   def create(user: User with Entity, organisation: Organisation with Entity, profile: Profile with Entity)(
       implicit graph: Graph,
       authContext: AuthContext
@@ -41,17 +40,17 @@ class RoleSrv @Inject() (@Named("with-thehive-schema") implicit val db: Database
   }
 }
 
-@EntitySteps[Role]
-class RoleSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Role](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): RoleSteps = new RoleSteps(newRaw)
-  override def newInstance(): RoleSteps                             = new RoleSteps(raw.clone())
-  def organisation: OrganisationSteps                               = new OrganisationSteps(raw.outTo[RoleOrganisation])
+object RoleOps {
+  implicit class RoleOpsDefs(traversal: Traversal.V[Role]) {
+    def organisation: Traversal.V[Organisation] = traversal.out[RoleOrganisation].v[Organisation]
 
-  def removeProfile(): Unit = {
-    raw.outToE[RoleProfile].drop().iterate()
-    ()
-  }
+    def removeProfile(): Unit = {
+      traversal.outE[RoleProfile].remove()
+      ()
+    }
 
-  def profile: ProfileSteps = new ProfileSteps(raw.outTo[RoleProfile])
-  def user: UserSteps       = new UserSteps(raw.inTo[UserRole])
+    def profile: Traversal.V[Profile] = traversal.out[RoleProfile].v[Profile]
+    def user: Traversal.V[User]       = traversal.in[UserRole].v[User]
+
+  }
 }
diff --git a/thehive/app/org/thp/thehive/services/ShareSrv.scala b/thehive/app/org/thp/thehive/services/ShareSrv.scala
index b9ca7c1db2..cdcfc6bfb6 100644
--- a/thehive/app/org/thp/thehive/services/ShareSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ShareSrv.scala
@@ -1,15 +1,22 @@
 package org.thp.thehive.services
 
-import gremlin.scala._
+import java.util.{Map => JMap}
+
 import javax.inject.{Inject, Named, Provider, Singleton}
+import org.apache.tinkerpop.gremlin.process.traversal.P
+import org.apache.tinkerpop.gremlin.structure.{Graph, T}
+import org.thp.scalligraph.CreateError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
-import org.thp.scalligraph.{CreateError, EntitySteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.ShareOps._
+import org.thp.thehive.services.TaskOps._
 
 import scala.util.{Failure, Try}
 
@@ -20,7 +27,7 @@ class ShareSrv @Inject() (
     caseSrvProvider: Provider[CaseSrv],
     taskSrv: TaskSrv,
     observableSrvProvider: Provider[ObservableSrv]
-) extends VertexSrv[Share, ShareSteps] {
+) extends VertexSrv[Share] {
   lazy val caseSrv: CaseSrv             = caseSrvProvider.get
   lazy val observableSrv: ObservableSrv = observableSrvProvider.get
 
@@ -30,8 +37,6 @@ class ShareSrv @Inject() (
   val shareTaskSrv         = new EdgeSrv[ShareTask, Share, Task]
   val shareObservableSrv   = new EdgeSrv[ShareObservable, Share, Observable]
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): ShareSteps = new ShareSteps(raw)
-
   /**
     * Shares a case (creates a share entity) for a precise organisation
     * according to the given profile.
@@ -46,7 +51,7 @@ class ShareSrv @Inject() (
       implicit graph: Graph,
       authContext: AuthContext
   ): Try[Share with Entity] =
-    get(`case`, organisation.name).headOption() match {
+    get(`case`, organisation.name).headOption match {
       case Some(_) => Failure(CreateError(s"Case #${`case`.number} is already shared with organisation ${organisation.name}"))
       case None =>
         for {
@@ -58,20 +63,20 @@ class ShareSrv @Inject() (
         } yield createdShare
     }
 
-  def get(`case`: Case with Entity, organisationName: String)(implicit graph: Graph): ShareSteps =
+  def get(`case`: Case with Entity, organisationName: String)(implicit graph: Graph): Traversal.V[Share] =
     caseSrv.get(`case`).share(organisationName)
 
-  def get(observable: Observable with Entity, organisationName: String)(implicit graph: Graph): ShareSteps =
+  def get(observable: Observable with Entity, organisationName: String)(implicit graph: Graph): Traversal.V[Share] =
     observableSrv.get(observable).share(organisationName)
 
-  def get(task: Task with Entity, organisationName: String)(implicit graph: Graph): ShareSteps =
+  def get(task: Task with Entity, organisationName: String)(implicit graph: Graph): Traversal.V[Share] =
     taskSrv.get(task).share(organisationName)
 
   def update(
       share: Share with Entity,
       profile: Profile with Entity
   )(implicit graph: Graph, authContext: AuthContext): Try[ShareProfile with Entity] = {
-    get(share).outToE[ShareProfile].remove()
+    get(share).outE[ShareProfile].remove()
     for {
       newShareProfile <- shareProfileSrv.create(ShareProfile(), share, profile)
       case0           <- get(share).`case`.getOrFail("Case")
@@ -81,7 +86,7 @@ class ShareSrv @Inject() (
   }
 
 //  def remove(`case`: Case with Entity, organisationId: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-//    caseSrv.get(`case`).inTo[ShareCase].filter(_.inTo[OrganisationShare])._id.getOrFail().flatMap(remove(_)) // FIXME add organisation ?
+//    caseSrv.get(`case`).in[ShareCase].filter(_.in[OrganisationShare])._id.getOrFail().flatMap(remove(_)) // FIXME add organisation ?
 
   def remove(shareId: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
     for {
@@ -103,8 +108,8 @@ class ShareSrv @Inject() (
     for {
       shareTask <- taskSrv
         .get(task)
-        .inToE[ShareTask]
-        .filter(st => new ShareSteps(st.outV().raw).byOrganisationName(organisation.name))
+        .inE[ShareTask]
+        .filter(_.outV.v[Share].byOrganisationName(organisation.name))
         .getOrFail("Task")
       case0 <- taskSrv.get(task).`case`.getOrFail("Case")
       _     <- auditSrv.share.unshareTask(task, case0, organisation)
@@ -123,8 +128,8 @@ class ShareSrv @Inject() (
     for {
       shareObservable <- observableSrv
         .get(observable)
-        .inToE[ShareObservable]
-        .filter(_.outV().inTo[OrganisationShare].hasId(organisation._id))
+        .inE[ShareObservable]
+        .filter(_.outV.in[OrganisationShare].hasId(organisation._id))
         .getOrFail("Share")
       case0 <- observableSrv.get(observable).`case`.getOrFail("Case")
       _     <- auditSrv.share.unshareObservable(observable, case0, organisation)
@@ -138,7 +143,12 @@ class ShareSrv @Inject() (
   def shareCaseTasks(
       share: Share with Entity
   )(implicit graph: Graph, authContext: AuthContext): Try[Seq[ShareTask with Entity]] =
-    get(share).`case`.tasks.filter(_.not(_.shares.hasId(share._id))).toIterator.toTry(shareTaskSrv.create(ShareTask(), share, _))
+    get(share)
+      .`case`
+      .tasks
+      .filterNot(_.shares.hasId(share._id))
+      .toIterator
+      .toTry(shareTaskSrv.create(ShareTask(), share, _))
 
   /**
     * Shares a task for an already shared case
@@ -180,7 +190,12 @@ class ShareSrv @Inject() (
   def shareCaseObservables(
       share: Share with Entity
   )(implicit graph: Graph, authContext: AuthContext): Try[Seq[ShareObservable with Entity]] =
-    get(share).`case`.observables.filter(_.not(_.shares.hasId(share._id))).toIterator.toTry(shareObservableSrv.create(ShareObservable(), share, _))
+    get(share)
+      .`case`
+      .observables
+      .filter(_.shares.has(T.id, P.neq(share._id)))
+      .toIterator
+      .toTry(shareObservableSrv.create(ShareObservable(), share, _))
 
   /**
     * Does a full rebuild of the share status of a task,
@@ -223,7 +238,7 @@ class ShareSrv @Inject() (
       .get(task)
       .shares
       .organisation
-      .toList
+      .toSeq
 
     organisations
       .filterNot(existingOrgs.contains)
@@ -246,7 +261,7 @@ class ShareSrv @Inject() (
       .get(observable)
       .shares
       .organisation
-      .toList
+      .toSeq
 
     organisations
       .filterNot(existingOrgs.contains)
@@ -295,53 +310,50 @@ class ShareSrv @Inject() (
   }
 }
 
-@EntitySteps[Share]
-class ShareSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[Share](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): ShareSteps = new ShareSteps(newRaw)
-  override def newInstance(): ShareSteps                             = new ShareSteps(raw.clone())
+object ShareOps {
+  implicit class ShareOpsDefs(traversal: Traversal.V[Share]) {
+    def relatedTo(`case`: Case with Entity): Traversal.V[Share] = traversal.filter(_.`case`.hasId(`case`._id))
 
-  def relatedTo(`case`: Case with Entity): ShareSteps = this.filter(_.`case`.get(`case`._id))
+    def `case`: Traversal.V[Case] = traversal.out[ShareCase].v[Case]
 
-  def `case`: CaseSteps = new CaseSteps(raw.outTo[ShareCase])
+    def relatedTo(organisation: Organisation with Entity): Traversal.V[Share] = traversal.filter(_.organisation.hasId(organisation._id))
 
-  def relatedTo(organisation: Organisation with Entity): ShareSteps = this.filter(_.organisation.get(organisation._id))
+    def organisation: Traversal.V[Organisation] = traversal.in[OrganisationShare].v[Organisation]
 
-  def organisation: OrganisationSteps = new OrganisationSteps(raw.inTo[OrganisationShare])
+    def tasks: Traversal.V[Task] = traversal.out[ShareTask].v[Task]
 
-  def tasks = new TaskSteps(raw.outTo[ShareTask])
+    def byTask(taskId: String): Traversal.V[Share] = traversal.filter(
+      _.out[ShareTask].hasId(taskId)
+    )
 
-  def byTask(taskId: String): ShareSteps = this.filter(
-    _.outTo[ShareTask].hasId(taskId)
-  )
+    def byObservable(observableId: String): Traversal.V[Share] = traversal.filter(
+      _.out[ShareObservable].hasId(observableId)
+    )
 
-  def byObservable(observableId: String): ShareSteps = this.filter(
-    _.outTo[ShareObservable].hasId(observableId)
-  )
+    def byOrganisationName(organisationName: String): Traversal.V[Share] = traversal.filter(
+      _.in[OrganisationShare].has("name", organisationName)
+    )
 
-  def byOrganisationName(organisationName: String): ShareSteps = this.filter(
-    _.inTo[OrganisationShare].has("name", organisationName)
-  )
+    def observables: Traversal.V[Observable] = traversal.out[ShareObservable].v[Observable]
 
-  def observables = new ObservableSteps(raw.outTo[ShareObservable])
+    def profile: Traversal.V[Profile] = traversal.out[ShareProfile].v[Profile]
 
-  def profile: ProfileSteps = new ProfileSteps(raw.outTo[ShareProfile])
-
-  def richShare: Traversal[RichShare, RichShare] = Traversal(
-    raw
-      .project(
-        _.apply(By[Vertex]())
-          .and(By(__[Vertex].inTo[OrganisationShare].values[String]("name").fold))
-          .and(By(__[Vertex].outTo[ShareCase].id().fold))
-          .and(By(__[Vertex].outTo[ShareProfile].values[String]("name").fold))
-      )
-      .map {
-        case (share, organisationName, caseId, profileName) =>
-          RichShare(
-            share.as[Share],
-            onlyOneOf[AnyRef](caseId).toString,
-            onlyOneOf[String](organisationName),
-            onlyOneOf[String](profileName)
-          )
-      }
-  )
+    def richShare: Traversal[RichShare, JMap[String, Any], Converter[RichShare, JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.in[OrganisationShare].v[Organisation].value(_.name).fold)
+            .by(_.out[ShareCase]._id.fold)
+            .by(_.out[ShareProfile].v[Profile].value(_.name).fold)
+        )
+        .domainMap {
+          case (share, organisationName, caseId, profileName) =>
+            RichShare(
+              share,
+              caseId.head,
+              organisationName.head,
+              profileName.head
+            )
+        }
+  }
 }
diff --git a/thehive/app/org/thp/thehive/services/StreamSrv.scala b/thehive/app/org/thp/thehive/services/StreamSrv.scala
index cb6fc196d7..10a06443bb 100644
--- a/thehive/app/org/thp/thehive/services/StreamSrv.scala
+++ b/thehive/app/org/thp/thehive/services/StreamSrv.scala
@@ -13,7 +13,8 @@ import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.services.EventSrv
 import org.thp.scalligraph.services.config.ApplicationConfig.finiteDurationFormat
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.thehive.services.AuditOps._
 import play.api.Logger
 import play.api.libs.json.Json
 
@@ -72,7 +73,7 @@ class StreamActor(
         val visibleIds = auditSrv
           .getByIds(ids: _*)
           .visible(authContext)
-          .toList
+          .toSeq
           .map(_._id)
         logger.debug(s"[$self] AuditStreamMessage $ids => $visibleIds")
         if (visibleIds.nonEmpty) {
@@ -113,7 +114,7 @@ class StreamActor(
         val visibleIds = auditSrv
           .getByIds(ids: _*)
           .visible(authContext)
-          .toList
+          .toSeq
           .map(_._id)
         logger.debug(s"[$self] AuditStreamMessage $ids => $visibleIds")
         if (visibleIds.nonEmpty) {
diff --git a/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala b/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala
index a57a595440..a2828307ee 100644
--- a/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala
@@ -3,15 +3,15 @@ package org.thp.thehive.services
 import java.net.URI
 import java.util.concurrent.TimeUnit
 
-import gremlin.scala.Graph
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
 import javax.inject.{Inject, Named, Provider, Singleton}
 import org.apache.commons.codec.binary.Base32
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth._
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AuthenticationError, MultiFactorCodeRequired}
 import play.api.Configuration
 import play.api.mvc.RequestHeader
@@ -72,10 +72,10 @@ class TOTPAuthSrv(
     }
 
   def getSecret(username: String)(implicit graph: Graph): Option[String] =
-    userSrv.get(username).headOption().flatMap(_.totpSecret)
+    userSrv.get(username).headOption.flatMap(_.totpSecret)
 
   def unsetSecret(username: String)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-    userSrv.get(username).updateOne("totpSecret" -> None).map(_ => ())
+    userSrv.get(username).update(_.totpSecret, None).domainMap(_ => ()).getOrFail("User")
 
   def generateSecret(): String = {
     val key = Array.ofDim[Byte](20)
@@ -89,8 +89,9 @@ class TOTPAuthSrv(
   def setSecret(username: String, secret: String)(implicit graph: Graph, authContext: AuthContext): Try[String] =
     userSrv
       .get(username)
-      .update("totpSecret" -> Some(secret))
-      .map(_ => secret)
+      .update(_.totpSecret, Some(secret))
+      .domainMap(_ => secret)
+      .getOrFail("User")
 
   def getSecretURI(username: String, secret: String): URI =
     new URI("otpauth", "totp", s"/TheHive:$username", s"secret=$secret&issuer=$issuerName", null)
diff --git a/thehive/app/org/thp/thehive/services/TagSrv.scala b/thehive/app/org/thp/thehive/services/TagSrv.scala
index 973839d390..7f888bd22c 100644
--- a/thehive/app/org/thp/thehive/services/TagSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TagSrv.scala
@@ -1,22 +1,23 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
-import gremlin.scala.{Graph, GremlinScala, Key, Vertex}
 import javax.inject.{Inject, Named, Singleton}
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.scalligraph.services.{IntegrityCheckOps, VertexSrv}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.models.{CaseTag, ObservableTag, Tag}
+import org.thp.thehive.services.TagOps._
 
 import scala.util.{Success, Try}
 
 @Singleton
 class TagSrv @Inject() (appConfig: ApplicationConfig, @Named("integrity-check-actor") integrityCheckActor: ActorRef)(
     implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[Tag, TagSteps] {
+) extends VertexSrv[Tag] {
 
   val autoCreateConfig: ConfigItem[Boolean, Boolean] =
     appConfig.item[Boolean]("tags.autocreate", "If true, create automatically tag if it doesn't exist")
@@ -38,15 +39,13 @@ class TagSrv @Inject() (appConfig: ApplicationConfig, @Named("integrity-check-ac
     )
   def defaultColour: Int = defaultColourConfig.get
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): TagSteps = new TagSteps(raw)
-
   def parseString(tagName: String): Tag =
     Tag.fromString(tagName, defaultNamespace, defaultColour)
 
-  override def get(idOrName: String)(implicit graph: Graph): TagSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[Tag] =
     getByIds(idOrName)
 
-  def getTag(tag: Tag)(implicit graph: Graph): TagSteps = initSteps.getTag(tag)
+  def getTag(tag: Tag)(implicit graph: Graph): Traversal.V[Tag] = startTraversal.getTag(tag)
 
   def getOrCreate(tagName: String)(implicit graph: Graph, authContext: AuthContext): Try[Tag with Entity] = {
     val tag = parseString(tagName)
@@ -62,34 +61,34 @@ class TagSrv @Inject() (appConfig: ApplicationConfig, @Named("integrity-check-ac
 
   def create(tag: Tag)(implicit graph: Graph, authContext: AuthContext): Try[Tag with Entity] = createEntity(tag)
 
-  override def exists(e: Tag)(implicit graph: Graph): Boolean = initSteps.getByName(e.namespace, e.predicate, e.value).exists()
+  override def exists(e: Tag)(implicit graph: Graph): Boolean = startTraversal.getByName(e.namespace, e.predicate, e.value).exists
 }
 
-class TagSteps(raw: GremlinScala[Vertex])(implicit db: Database, graph: Graph) extends VertexSteps[Tag](raw) {
-  override def newInstance(newRaw: GremlinScala[Vertex]): TagSteps = new TagSteps(newRaw)
-  override def newInstance(): TagSteps                             = new TagSteps(raw.clone())
+object TagOps {
 
-  def getTag(tag: Tag): TagSteps = getByName(tag.namespace, tag.predicate, tag.value)
+  implicit class TagOpsDefs(traversal: Traversal.V[Tag]) {
 
-  def getByName(namespace: String, predicate: String, value: Option[String]): TagSteps = {
-    val step = newInstance(
-      raw
-        .has(Key("namespace") of namespace)
-        .has(Key("predicate") of predicate)
-    )
-    value.fold(step.hasNot("value"))(v => step.has("value", v))
-  }
+    def getTag(tag: Tag): Traversal.V[Tag] = getByName(tag.namespace, tag.predicate, tag.value)
 
-  def displayName: Traversal[String, String] = this.map(_.toString)
+    def getByName(namespace: String, predicate: String, value: Option[String]): Traversal.V[Tag] = {
+      val step = traversal
+        .has("namespace", namespace)
+        .has("predicate", predicate)
+      value.fold(step.hasNot("value"))(v => step.has("value", v))
+    }
 
-  def fromCase: TagSteps = this.filter(_.inTo[CaseTag])
+    def displayName: Traversal[String, Vertex, Converter[String, Vertex]] = traversal.domainMap(_.toString)
+
+    def fromCase: Traversal.V[Tag] = traversal.filter(_.in[CaseTag])
+
+    def fromObservable: Traversal.V[Tag] = traversal.filter(_.in[ObservableTag])
+  }
 
-  def fromObservable: TagSteps = this.filter(_.inTo[ObservableTag])
 }
 
 class TagIntegrityCheckOps @Inject() (@Named("with-thehive-schema") val db: Database, val service: TagSrv) extends IntegrityCheckOps[Tag] {
 
-  override def resolve(entities: List[Tag with Entity])(implicit graph: Graph): Try[Unit] = {
+  override def resolve(entities: Seq[Tag with Entity])(implicit graph: Graph): Try[Unit] = {
     firstCreatedEntity(entities).foreach {
       case (head, tail) =>
         tail.foreach(copyEdge(_, head))
diff --git a/thehive/app/org/thp/thehive/services/TaskSrv.scala b/thehive/app/org/thp/thehive/services/TaskSrv.scala
index 1ae5baf251..e962ce220d 100644
--- a/thehive/app/org/thp/thehive/services/TaskSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TaskSrv.scala
@@ -1,25 +1,27 @@
 package org.thp.thehive.services
 
+import java.util
 import java.util.Date
 
-import gremlin.scala._
 import javax.inject.{Inject, Named, Provider, Singleton}
-import org.thp.scalligraph.EntitySteps
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
 import org.thp.thehive.models.{TaskStatus, _}
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.TaskOps._
 import play.api.libs.json.{JsNull, JsObject, Json}
 
 import scala.util.{Failure, Success, Try}
 
 @Singleton
-class TaskSrv @Inject() (caseSrvProvider: Provider[CaseSrv], auditSrv: AuditSrv)(
-    implicit @Named("with-thehive-schema") db: Database
-) extends VertexSrv[Task, TaskSteps] {
+class TaskSrv @Inject() (caseSrvProvider: Provider[CaseSrv], auditSrv: AuditSrv)(implicit
+    @Named("with-thehive-schema") db: Database
+) extends VertexSrv[Task] {
 
   lazy val caseSrv: CaseSrv = caseSrvProvider.get
   val caseTemplateTaskSrv   = new EdgeSrv[CaseTemplateTask, CaseTemplate, Task]
@@ -32,10 +34,8 @@ class TaskSrv @Inject() (caseSrvProvider: Provider[CaseSrv], auditSrv: AuditSrv)
       _    <- owner.map(taskUserSrv.create(TaskUser(), task, _)).flip
     } yield RichTask(task, owner)
 
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): TaskSteps = new TaskSteps(raw)
-
   def isAvailableFor(taskId: String)(implicit graph: Graph, authContext: AuthContext): Boolean =
-    getByIds(taskId).visible(authContext).exists()
+    getByIds(taskId).visible(authContext).exists
 
   def unassign(task: Task with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
     get(task).unassign()
@@ -43,7 +43,7 @@ class TaskSrv @Inject() (caseSrvProvider: Provider[CaseSrv], auditSrv: AuditSrv)
   }
 
   def remove(task: Task with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] =
-    get(task).caseTemplate.headOption() match {
+    get(task).caseTemplate.headOption match {
       case None =>
         get(task)
           .shares
@@ -63,13 +63,13 @@ class TaskSrv @Inject() (caseSrvProvider: Provider[CaseSrv], auditSrv: AuditSrv)
     }
 
   override def update(
-      steps: TaskSteps,
+      traversal: Traversal.V[Task],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(TaskSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Task], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (taskSteps, updatedFields) =>
         for {
-          t <- taskSteps.newInstance().getOrFail()
+          t <- taskSteps.clone().getOrFail("Task")
           _ <- auditSrv.task.update(t, updatedFields)
         } yield ()
     }
@@ -84,21 +84,21 @@ class TaskSrv @Inject() (caseSrvProvider: Provider[CaseSrv], auditSrv: AuditSrv)
     * @param authContext auth db
     * @return
     */
-  def updateStatus(t: Task with Entity, o: User with Entity, s: TaskStatus.Value)(
-      implicit graph: Graph,
+  def updateStatus(t: Task with Entity, o: User with Entity, s: TaskStatus.Value)(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[Task with Entity] = {
-    def setStatus(): Try[Task with Entity] = get(t).updateOne("status" -> s)
+    def setStatus(): Try[Task with Entity] = get(t).update(_.status, s).getOrFail("")
 
     s match {
       case TaskStatus.Cancel | TaskStatus.Waiting => setStatus()
       case TaskStatus.Completed =>
-        t.endDate.fold(get(t).updateOne("status" -> s, "endDate" -> Some(new Date())))(_ => setStatus())
+        t.endDate.fold(get(t).update(_.status, s).update(_.endDate, Some(new Date())).getOrFail(""))(_ => setStatus())
 
       case TaskStatus.InProgress =>
         for {
-          _       <- get(t).assignee.headOption().fold(assign(t, o))(_ => Success(()))
-          updated <- t.startDate.fold(get(t).updateOne("status" -> s, "startDate" -> Some(new Date())))(_ => setStatus())
+          _       <- get(t).assignee.headOption.fold(assign(t, o))(_ => Success(()))
+          updated <- t.startDate.fold(get(t).update(_.status, s).update(_.startDate, Some(new Date())).getOrFail(""))(_ => setStatus())
         } yield updated
 
       case _ => Failure(new Exception(s"Invalid TaskStatus $s for update"))
@@ -114,98 +114,86 @@ class TaskSrv @Inject() (caseSrvProvider: Provider[CaseSrv], auditSrv: AuditSrv)
   }
 }
 
-@EntitySteps[Task]
-class TaskSteps(raw: GremlinScala[Vertex])(implicit db: Database, graph: Graph) extends VertexSteps[Task](raw) {
-
-  def visible(implicit authContext: AuthContext): TaskSteps = newInstance(
-    raw.filter(
-      _.inTo[ShareTask]
-        .inTo[OrganisationShare]
-        .has(Key("name") of authContext.organisation)
-    )
-  )
-
-  override def newInstance(newRaw: GremlinScala[Vertex]): TaskSteps = new TaskSteps(newRaw)
-  override def newInstance(): TaskSteps                             = new TaskSteps(raw.clone())
-
-  def active: TaskSteps = newInstance(raw.filterNot(_.has(Key("status") of "Cancel")))
+object TaskOps {
+  implicit class TaskOpsDefs(traversal: Traversal.V[Task]) {
 
-  def can(permission: Permission)(implicit authContext: AuthContext): TaskSteps =
-    if (authContext.permissions.contains(permission))
-      this.filter(
-        _.inTo[ShareTask]
-          .filter(_.outTo[ShareProfile].has("permissions", permission))
-          .inTo[OrganisationShare]
+    def visible(implicit authContext: AuthContext): Traversal.V[Task] =
+      traversal.filter(
+        _.in[ShareTask]
+          .in[OrganisationShare]
           .has("name", authContext.organisation)
       )
-    else
-      this.limit(0)
 
-  def `case`: CaseSteps = new CaseSteps(raw.inTo[ShareTask].outTo[ShareCase].dedup)
+    def active: Traversal.V[Task] = traversal.filterNot(_.has("status", "Cancel"))
 
-  def caseTemplate = new CaseTemplateSteps(raw.inTo[CaseTemplateTask])
+    def can(permission: Permission)(implicit authContext: AuthContext): Traversal.V[Task] =
+      if (authContext.permissions.contains(permission))
+        traversal.filter(
+          _.in[ShareTask]
+            .filter(_.out[ShareProfile].has("permissions", permission))
+            .in[OrganisationShare]
+            .has("name", authContext.organisation)
+        )
+      else
+        traversal.limit(0)
+
+    def `case`: Traversal.V[Case] = traversal.in[ShareTask].out[ShareCase].dedup.v[Case]
 
-  def caseTasks: TaskSteps = this.filter(_.inToE[ShareTask])
+    def caseTemplate: Traversal.V[CaseTemplate] = traversal.in[CaseTemplateTask].v[CaseTemplate]
 
-  def caseTemplateTasks: TaskSteps = this.filter(_.inToE[CaseTemplateTask])
+    def caseTasks: Traversal.V[Task] = traversal.filter(_.inE[ShareTask]).v[Task]
 
-  def logs: LogSteps = new LogSteps(raw.outTo[TaskLog])
+    def caseTemplateTasks: Traversal.V[Task] = traversal.filter(_.inE[CaseTemplateTask]).v[Task]
 
-  def assignee: UserSteps = new UserSteps(raw.outTo[TaskUser])
+    def logs: Traversal.V[Log] = traversal.out[TaskLog].v[Log]
 
-  def unassigned: TaskSteps = this.not(_.outToE[TaskUser])
+    def assignee: Traversal.V[User] = traversal.out[TaskUser].v[User]
 
-  def organisations = new OrganisationSteps(raw.inTo[ShareTask].inTo[OrganisationShare])
-  def organisations(permission: Permission) =
-    new OrganisationSteps(raw.inTo[ShareTask].filter(_.outTo[ShareProfile].has(Key("permissions") of permission)).inTo[OrganisationShare])
+    def unassigned: Traversal.V[Task] = traversal.filterNot(_.outE[TaskUser])
 
-  def origin: OrganisationSteps = new OrganisationSteps(raw.inTo[ShareTask].has(Key("owner") of true).inTo[OrganisationShare])
+    def organisations: Traversal.V[Organisation] = traversal.in[ShareTask].in[OrganisationShare].v[Organisation]
+    def organisations(permission: Permission): Traversal.V[Organisation] =
+      traversal.in[ShareTask].filter(_.out[ShareProfile].has("permissions", permission)).in[OrganisationShare].v[Organisation]
 
-  def assignableUsers(implicit authContext: AuthContext): UserSteps =
-    organisations(Permissions.manageTask)
-      .visible
-      .users(Permissions.manageTask)
-      .dedup
+    def origin: Traversal.V[Organisation] = traversal.in[ShareTask].has("owner", true).in[OrganisationShare].v[Organisation]
 
-  def richTask: Traversal[RichTask, RichTask] =
-    Traversal(
-      raw
+    def assignableUsers(implicit authContext: AuthContext): Traversal.V[User] =
+      organisations(Permissions.manageTask)
+        .visible
+        .users(Permissions.manageTask)
+        .dedup
+
+    def richTask: Traversal[RichTask, util.Map[String, Any], Converter[RichTask, util.Map[String, Any]]] =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[TaskUser].fold))
+          _.by
+            .by(_.out[TaskUser].v[User].fold)
         )
-        .map {
-          case (task, user) =>
-            RichTask(
-              task.as[Task],
-              atMostOneOf(user).map(_.as[User])
-            )
+        .domainMap {
+          case (task, user) => RichTask(task, user.headOption)
         }
-    )
 
-  def richTaskWithCustomRenderer[A](entityRenderer: TaskSteps => TraversalLike[_, A]): Traversal[(RichTask, A), (RichTask, A)] =
-    Traversal(
-      raw
+    def richTaskWithCustomRenderer[D, G, C <: Converter[D, G]](
+        entityRenderer: Traversal.V[Task] => Traversal[D, G, C]
+    ): Traversal[(RichTask, D), util.Map[String, Any], Converter[(RichTask, D), util.Map[String, Any]]] =
+      traversal
         .project(
-          _.apply(By[Vertex]())
-            .and(By(__[Vertex].outTo[TaskUser].fold))
-            .and(By(entityRenderer(newInstance(__[Vertex])).raw))
+          _.by
+            .by(_.out[TaskUser].v[User].fold)
+            .by(entityRenderer)
         )
-        .map {
+        .domainMap {
           case (task, user, renderedEntity) =>
-            RichTask(
-              task.as[Task],
-              atMostOneOf(user).map(_.as[User])
-            ) -> renderedEntity
+            RichTask(task, user.headOption) -> renderedEntity
         }
-    )
 
-  def unassign(): Unit = this.outToE[TaskUser].remove()
+    def unassign(): Unit = traversal.outE[TaskUser].remove()
 
-  def shares: ShareSteps = new ShareSteps(raw.inTo[ShareTask])
+    def shares: Traversal.V[Share] = traversal.in[ShareTask].v[Share]
 
-  def share(implicit authContext: AuthContext): ShareSteps = share(authContext.organisation)
+    def share(implicit authContext: AuthContext): Traversal.V[Share] = share(authContext.organisation)
 
-  def share(organistionName: String): ShareSteps =
-    new ShareSteps(this.inTo[ShareTask].filter(_.inTo[OrganisationShare].has("name", organistionName)).raw)
+    def share(organistionName: String): Traversal.V[Share] =
+      traversal.in[ShareTask].filter(_.in[OrganisationShare].has("name", organistionName)).v[Share]
+  }
 }
diff --git a/thehive/app/org/thp/thehive/services/UserSrv.scala b/thehive/app/org/thp/thehive/services/UserSrv.scala
index a6041fbfb9..442caa69c9 100644
--- a/thehive/app/org/thp/thehive/services/UserSrv.scala
+++ b/thehive/app/org/thp/thehive/services/UserSrv.scala
@@ -1,23 +1,27 @@
 package org.thp.thehive.services
 
 import java.util.regex.Pattern
-import java.util.{List => JList}
+import java.util.{List => JList, Map => JMap}
 
-import scala.collection.JavaConverters._
 import akka.actor.ActorRef
-import gremlin.scala._
 import javax.inject.{Inject, Named, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.Order
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
 import org.thp.scalligraph.auth.{AuthContext, AuthContextImpl, Permission}
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{Traversal, TraversalLike, VertexSteps}
-import org.thp.scalligraph.{AuthorizationError, BadRequestError, EntitySteps, InternalError, RichOptionTry}
+import org.thp.scalligraph.traversal.Converter.CList
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.{AuthorizationError, BadRequestError, InternalError, RichOptionTry}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.ProfileOps._
+import org.thp.thehive.services.RoleOps._
+import org.thp.thehive.services.UserOps._
 import play.api.Configuration
 import play.api.libs.json.{JsObject, Json}
 
@@ -31,12 +35,11 @@ class UserSrv @Inject() (
     attachmentSrv: AttachmentSrv,
     @Named("integrity-check-actor") integrityCheckActor: ActorRef,
     @Named("with-thehive-schema") implicit val db: Database
-) extends VertexSrv[User, UserSteps] {
+) extends VertexSrv[User] {
   val defaultUserDomain: Option[String] = configuration.getOptional[String]("auth.defaultUserDomain")
   val fullUserNameRegex: Pattern        = "[\\p{Graph}&&[^@.]](?:[\\p{Graph}&&[^@]]*)*@\\p{Alnum}+(?:[\\p{Alnum}-.])*".r.pattern
 
-  val userAttachmentSrv                                                           = new EdgeSrv[UserAttachment, User, Attachment]
-  override def steps(raw: GremlinScala[Vertex])(implicit graph: Graph): UserSteps = new UserSteps(raw)
+  val userAttachmentSrv = new EdgeSrv[UserAttachment, User, Attachment]
 
   override def createEntity(e: User)(implicit graph: Graph, authContext: AuthContext): Try[User with Entity] = {
     integrityCheckActor ! IntegrityCheckActor.EntityAdded("User")
@@ -53,26 +56,26 @@ class UserSrv @Inject() (
   }
 
   // TODO return Try[Unit]
-  def addUserToOrganisation(user: User with Entity, organisation: Organisation with Entity, profile: Profile with Entity)(
-      implicit graph: Graph,
+  def addUserToOrganisation(user: User with Entity, organisation: Organisation with Entity, profile: Profile with Entity)(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichUser] =
-    (if (!get(user).organisations.getByName(organisation.name).exists())
+    (if (!get(user).organisations.getByName(organisation.name).exists)
        roleSrv.create(user, organisation, profile)
      else
        Success(())).flatMap { _ =>
       for {
-        richUser <- get(user).richUser(organisation.name).getOrFail()
+        richUser <- get(user).richUser(organisation.name).getOrFail("User")
         _        <- auditSrv.user.create(user, richUser.toJson)
       } yield richUser
     }
 
-  def addOrCreateUser(user: User, avatar: Option[FFile], organisation: Organisation with Entity, profile: Profile with Entity)(
-      implicit graph: Graph,
+  def addOrCreateUser(user: User, avatar: Option[FFile], organisation: Organisation with Entity, profile: Profile with Entity)(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[RichUser] =
     get(user.login)
-      .getOrFail()
+      .getOrFail("User")
       .orElse {
         for {
           validUser   <- checkUser(user)
@@ -83,13 +86,13 @@ class UserSrv @Inject() (
       .flatMap(addUserToOrganisation(_, organisation, profile))
 
   def canSetPassword(user: User with Entity)(implicit graph: Graph, authContext: AuthContext): Boolean = {
-    val userOrganisations     = get(user).organisations.name.toList.toSet
-    val operatorOrganisations = current.organisations(Permissions.manageUser).name.toList
+    val userOrganisations     = get(user).organisations.value(_.name).toSet
+    val operatorOrganisations = current.organisations(Permissions.manageUser).value(_.name).toSeq
     operatorOrganisations.contains(Organisation.administration.name) || (userOrganisations -- operatorOrganisations).isEmpty
   }
 
   def delete(user: User with Entity, organisation: Organisation with Entity)(implicit graph: Graph, authContext: AuthContext): Try[Unit] = {
-    if (get(user).organisations.hasNot("name", organisation.name).exists())
+    if (get(user).organisations.hasNot("name", organisation.name).exists)
       get(user).role.filter(_.organisation.has("name", organisation.name)).remove()
     else {
       get(user).role.remove()
@@ -98,43 +101,43 @@ class UserSrv @Inject() (
     auditSrv.user.delete(user, organisation)
   }
 
-  override def exists(e: User)(implicit graph: Graph): Boolean = initSteps.getByName(e.login).exists()
+  override def exists(e: User)(implicit graph: Graph): Boolean = startTraversal.getByName(e.login).exists
 
   def lock(user: User with Entity)(implicit graph: Graph, authContext: AuthContext): Try[User with Entity] =
     if (user.login == authContext.userId)
       Failure(AuthorizationError("You cannot lock yourself"))
     else
       for {
-        updatedUser <- get(user).updateOne("locked" -> true)
+        updatedUser <- get(user).update(_.locked, true: Boolean).getOrFail("User")
         _           <- auditSrv.user.update(updatedUser, Json.obj("locked" -> true))
       } yield updatedUser
 
   def unlock(user: User with Entity)(implicit graph: Graph, authContext: AuthContext): Try[User with Entity] =
     for {
-      updatedUser <- get(user).updateOne("locked" -> false)
+      updatedUser <- get(user).update(_.locked, false: Boolean).getOrFail("User")
       _           <- auditSrv.user.update(updatedUser, Json.obj("locked" -> false))
     } yield updatedUser
 
-  def current(implicit graph: Graph, authContext: AuthContext): UserSteps = get(authContext.userId)
+  def current(implicit graph: Graph, authContext: AuthContext): Traversal.V[User] = get(authContext.userId)
 
-  override def get(idOrName: String)(implicit graph: Graph): UserSteps =
+  override def get(idOrName: String)(implicit graph: Graph): Traversal.V[User] =
     if (db.isValidId(idOrName)) getByIds(idOrName)
     else
-      defaultUserDomain.fold(initSteps.getByName(idOrName)) {
-        case d if !idOrName.contains('@') => initSteps.getByName(s"$idOrName@$d")
-        case _                            => initSteps.getByName(idOrName)
+      defaultUserDomain.fold(startTraversal.getByName(idOrName)) {
+        case d if !idOrName.contains('@') => startTraversal.getByName(s"$idOrName@$d")
+        case _                            => startTraversal.getByName(idOrName)
       }
 
   override def update(
-      steps: UserSteps,
+      traversal: Traversal.V[User],
       propertyUpdaters: Seq[PropertyUpdater]
-  )(implicit graph: Graph, authContext: AuthContext): Try[(UserSteps, JsObject)] =
-    auditSrv.mergeAudits(super.update(steps, propertyUpdaters)) {
+  )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[User], JsObject)] =
+    auditSrv.mergeAudits(super.update(traversal, propertyUpdaters)) {
       case (userSteps, updatedFields) =>
         userSteps
           .filterNot(_.systemUser)
-          .newInstance()
-          .getOrFail()
+          .clone()
+          .getOrFail("User")
           .flatMap(auditSrv.user.update(_, updatedFields))
     }
 
@@ -148,181 +151,184 @@ class UserSrv @Inject() (
 
   def unsetAvatar(user: User with Entity)(implicit graph: Graph): Unit = get(user).avatar.remove()
 
-  def setProfile(user: User with Entity, organisation: Organisation with Entity, profile: Profile with Entity)(
-      implicit graph: Graph,
+  def setProfile(user: User with Entity, organisation: Organisation with Entity, profile: Profile with Entity)(implicit
+      graph: Graph,
       authContext: AuthContext
   ): Try[Unit] =
     for {
-      role <- get(user).role.filter(_.organisation.get(organisation)).getOrFail()
+      role <- get(user).role.filter(_.organisation.getByIds(organisation._id)).getOrFail("User")
       _ = roleSrv.updateProfile(role, profile)
       _ <- auditSrv.user.changeProfile(user, organisation, profile)
     } yield ()
 }
 
-@EntitySteps[User]
-class UserSteps(raw: GremlinScala[Vertex])(implicit @Named("with-thehive-schema") db: Database, graph: Graph) extends VertexSteps[User](raw) {
-  def current(authContext: AuthContext): UserSteps = get(authContext.userId)
+object UserOps {
 
-  def get(idOrName: String): UserSteps =
-    if (db.isValidId(idOrName)) this.getByIds(idOrName)
-    else getByName(idOrName)
+  implicit class UserOpsDefs(traversal: Traversal.V[User]) {
+    def current(authContext: AuthContext): Traversal.V[User] = getByName(authContext.userId)
 
-  def getByName(login: String): UserSteps = this.has("login", login.toLowerCase)
+    def get(idOrName: String)(implicit db: Database): Traversal.V[User] =
+      if (db.isValidId(idOrName)) traversal.getByIds(idOrName)
+      else getByName(idOrName)
 
-  def visible(implicit authContext: AuthContext): UserSteps =
-    if (authContext.isPermitted(Permissions.manageOrganisation.permission)) this
-    else
-      this.filter(_.or(_.organisations.visibleOrganisationsTo.get(authContext.organisation), _.systemUser))
+    def getByName(login: String): Traversal.V[User] = traversal.has("login", login.toLowerCase)
 
-  override def newInstance(newRaw: GremlinScala[Vertex]): UserSteps = new UserSteps(newRaw)
-  override def newInstance(): UserSteps                             = new UserSteps(raw.clone())
+    def visible(implicit authContext: AuthContext): Traversal.V[User] =
+      if (authContext.isPermitted(Permissions.manageOrganisation.permission)) traversal
+      else
+        traversal.filter(_.or(_.organisations.visibleOrganisationsTo.getByName(authContext.organisation), _.systemUser))
 
-  def can(requiredPermission: Permission)(implicit authContext: AuthContext): UserSteps =
-    this.filter(_.organisations(requiredPermission).get(authContext.organisation))
+    def can(requiredPermission: Permission)(implicit authContext: AuthContext, db: Database): Traversal.V[User] =
+      traversal.filter(_.organisations(requiredPermission).getByName(authContext.organisation))
 
-  def getByAPIKey(key: String): UserSteps = new UserSteps(raw.has(Key("apikey") of key))
+    def getByAPIKey(key: String): Traversal.V[User] = traversal.has("apikey", key).v[User]
 
-  def organisations: OrganisationSteps = new OrganisationSteps(raw.outTo[UserRole].outTo[RoleOrganisation])
+    def organisations: Traversal.V[Organisation] = traversal.out[UserRole].out[RoleOrganisation].v[Organisation]
 
-  private def organisations0(requiredPermission: String): OrganisationSteps =
-    new OrganisationSteps(
-      raw
-        .outTo[UserRole]
-        .filter(_.outTo[RoleProfile].has(Key("permissions") of requiredPermission))
-        .outTo[RoleOrganisation]
-    )
+    protected def organisations0(requiredPermission: String): Traversal.V[Organisation] =
+      traversal
+        .out[UserRole]
+        .filter(_.out[RoleProfile].has("permissions", requiredPermission))
+        .out[RoleOrganisation]
+        .v[Organisation]
 
-  def organisations(requiredPermission: String): OrganisationSteps = {
-    val isInAdminOrganisation = newInstance().organisations0(requiredPermission).get(Organisation.administration.name).exists()
-    if (isInAdminOrganisation) new OrganisationSteps(db.labelFilter(db.getVertexModel[Organisation])(graph.V))
-    else organisations0(requiredPermission)
-  }
+    def organisations(requiredPermission: String)(implicit db: Database): Traversal.V[Organisation] = {
+      val isInAdminOrganisation = traversal.clone().organisations0(requiredPermission).getByName(Organisation.administration.name).exists
+      if (isInAdminOrganisation) db.labelFilter("Organisation")(traversal.V()).v[Organisation]
+      else organisations0(requiredPermission)
+    }
 
-  def organisationWithRole: Traversal[JList[(String, String)], JList[(String, String)]] =
-    this
-      .outTo[UserRole]
-      .project(
-        _.by(_.outTo[RoleOrganisation].value[String]("name"))
-          .by(_.outTo[RoleProfile].value[String]("name"))
-      )
-      .fold
-
-  def config: ConfigSteps = new ConfigSteps(raw.outTo[UserConfig])
-
-  def getAuthContext(requestId: String, organisation: Option[String]): Traversal[AuthContext, AuthContext] = {
-    val organisationName = organisation
-      .orElse(
-        this
-          .newInstance()
-          .outTo[UserRole]
-          .order(List(By(Key[Long]("_createdAt"), Order.asc)))
-          .outTo[RoleOrganisation]
-          .value[String]("name")
-          .headOption()
-      )
-      .getOrElse(Organisation.administration.name)
-    getAuthContext(requestId, organisationName)
-  }
+    def organisationWithRole: Traversal[Seq[(String, String)], JList[JMap[String, Any]], CList[(String, String), JMap[String, Any], Converter[
+      (String, String),
+      JMap[String, Any]
+    ]]] =
+      traversal
+        .out[UserRole]
+        .project(
+          _.by(_.out[RoleOrganisation].v[Organisation].value(_.name))
+            .by(_.out[RoleProfile].v[Profile].value(_.name))
+        )
+        .fold
+
+    def config: Traversal.V[Config] = traversal.out[UserConfig].v[Config]
+
+    def getAuthContext(
+        requestId: String,
+        organisation: Option[String]
+    ): Traversal[AuthContext, JMap[String, Any], Converter[AuthContext, JMap[String, Any]]] = {
+      val organisationName = organisation
+        .orElse(
+          traversal
+            .clone()
+            .out[UserRole]
+            .sort(_.by("_createdAt", Order.asc))
+            .out[RoleOrganisation]
+            .v[Organisation]
+            .value(_.name)
+            .headOption
+        )
+        .getOrElse(Organisation.administration.name)
+      getAuthContext(requestId, organisationName)
+    }
 
-  def getAuthContext(requestId: String, organisationName: String): Traversal[AuthContext, AuthContext] =
-    Traversal(
-      this
-        .filter(_.organisations.get(organisationName))
-        .raw
-        .has(Key("locked") of false)
+    def getAuthContext(
+        requestId: String,
+        organisationName: String
+    ): Traversal[AuthContext, JMap[String, Any], Converter[AuthContext, JMap[String, Any]]] =
+      traversal
+        .filter(_.organisations.getByName(organisationName))
+        .has("locked", false)
         .project(
-          _.apply(By(__.value[String]("login")))
-            .and(By(__.value[String]("name")))
-            .and(By(__[Vertex].outTo[UserRole].filter(_.outTo[RoleOrganisation].has(Key("name") of organisationName)).outTo[RoleProfile]))
+          _.byValue(_.login)
+            .byValue(_.name)
+            .by(_.out[UserRole].filter(_.out[RoleOrganisation].has("name", organisationName)).out[RoleProfile].v[Profile])
         )
-        .map {
+        .domainMap {
           case (userId, userName, profile) =>
             val scope =
               if (organisationName == Organisation.administration.name) "admin"
               else "organisation"
-            val permissions = Permissions.forScope(scope) & profile.as[Profile].permissions
+            val permissions = Permissions.forScope(scope) & profile.permissions
             AuthContextImpl(userId, userName, organisationName, requestId, permissions)
         }
-    )
-
-  def profile(organisation: String) =
-    new ProfileSteps(
-      this.outTo[UserRole].filter(_.outTo[RoleOrganisation].has("name", organisation)).outTo[RoleProfile].raw
-    )
-
-  def richUser(organisation: String): Traversal[RichUser, RichUser] =
-    this
-      .project(
-        _.by
-          .by(_.profile(organisation).fold)
-          .by(_.avatar.fold)
-      )
-      .collect {
-        case (user, profiles, attachment) if profiles.size() == 1 =>
-          val profile = profiles.get(0).as[Profile]
-          val avatar  = atMostOneOf[Vertex](attachment).map(_.as[Attachment].attachmentId)
-          RichUser(user.as[User], avatar, profile.name, profile.permissions, organisation)
-        case (user, _, attachment) =>
-          val avatar = atMostOneOf[Vertex](attachment).map(_.as[Attachment].attachmentId)
-          RichUser(user.as[User], avatar, "", Set.empty, organisation)
-      }
 
-  def richUser(implicit authContext: AuthContext): Traversal[RichUser, RichUser] =
-    this
-      .project(
-        _.by
-          .by(_.avatar.fold)
-          .by(_.role.project(_.by(_.profile).by(_.organisation.visible.name.fold)).fold)
-      )
-      .map {
-        case (user, attachment, profileOrganisations) =>
-          val po = profileOrganisations.asScala.collect {
-            case (profile, organisationName) if !organisationName.isEmpty => profile.as[Profile] -> organisationName.get(0)
-          }
-          po.find(_._2 == authContext.organisation)
-            .orElse(po.headOption)
-            .fold(throw InternalError(s"")) {
-              case (profile, organisationName) =>
-                val avatar = atMostOneOf[Vertex](attachment).map(_.as[Attachment].attachmentId)
-                RichUser(user.as[User], avatar, profile.name, profile.permissions, organisationName)
-            }
-      }
+    def profile(organisation: String): Traversal.V[Profile] =
+      traversal.out[UserRole].filter(_.out[RoleOrganisation].has("name", organisation)).out[RoleProfile].v[Profile]
 
-  def richUserWithCustomRenderer[A](organisation: String, entityRenderer: UserSteps => TraversalLike[_, A])(
-      implicit authContext: AuthContext
-  ): Traversal[(RichUser, A), (RichUser, A)] =
-    this
-      .project(
-        _.by
-          .by(_.profile(organisation).fold)
-          .by(_.avatar.fold)
-          .by(entityRenderer(_))
-      )
-      .collect {
-        case (user, profiles, attachment, renderedEntity) if profiles.size() == 1 =>
-          val profile = profiles.get(0).as[Profile]
-          val avatar  = atMostOneOf[Vertex](attachment).map(_.as[Attachment].attachmentId)
-          RichUser(user.as[User], avatar, profile.name, profile.permissions, organisation) -> renderedEntity
-        case (user, _, attachment, renderedEntity) =>
-          val avatar = atMostOneOf[Vertex](attachment).map(_.as[Attachment].attachmentId)
-          RichUser(user.as[User], avatar, "", Set.empty, organisation) -> renderedEntity
-      }
+    def richUser(implicit authContext: AuthContext): Traversal[RichUser, JMap[String, Any], Converter[RichUser, JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.avatar.fold)
+            .by(_.role.project(_.by(_.profile).by(_.organisation.visible.value(_.name))).fold)
+        )
+        .domainMap {
+          case (user, attachment, profileOrganisations) =>
+            profileOrganisations
+              .find(_._2 == authContext.organisation)
+              .orElse(profileOrganisations.headOption)
+              .fold(throw InternalError(s"")) { // FIXME
+                case (profile, organisationName) =>
+                  val avatar = attachment.headOption.map(_.attachmentId)
+                  RichUser(user, avatar, profile.name, profile.permissions, organisationName)
+              }
+        }
+
+    def richUser(organisation: String): Traversal[RichUser, JMap[String, Any], Converter[RichUser, JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.profile(organisation).fold)
+            .by(_.avatar.fold)
+        )
+        .domainMap {
+          case (user, profiles, attachment) =>
+            RichUser(
+              user,
+              attachment.headOption.map(_.attachmentId),
+              profiles.headOption.fold("")(_.name),
+              profiles.headOption.fold(Set.empty[Permission])(_.permissions),
+              organisation
+            )
+        }
 
-  def config(configName: String) = new ConfigSteps(
-    this.outTo[UserConfig].has("name", configName).raw
-  )
+    def richUserWithCustomRenderer[D, G, C <: Converter[D, G]](
+        organisation: String,
+        entityRenderer: Traversal.V[User] => Traversal[D, G, C]
+    ): Traversal[(RichUser, D), JMap[String, Any], Converter[(RichUser, D), JMap[String, Any]]] =
+      traversal
+        .project(
+          _.by
+            .by(_.profile(organisation).fold)
+            .by(_.avatar.fold)
+            .by(entityRenderer)
+        )
+        .domainMap {
+          case (user, profiles, attachment, renderedEntity) =>
+            RichUser(
+              user,
+              attachment.headOption.map(_.attachmentId),
+              profiles.headOption.fold("")(_.name),
+              profiles.headOption.fold(Set.empty[Permission])(_.permissions),
+              organisation
+            ) -> renderedEntity
+        }
 
-  def role: RoleSteps = new RoleSteps(raw.outTo[UserRole])
+    def config(configName: String): Traversal.V[Config] =
+      traversal.out[UserConfig].has("name", configName).v[Config]
 
-  def avatar: AttachmentSteps = new AttachmentSteps(raw.outTo[UserAttachment])
+    def role: Traversal.V[Role] = traversal.out[UserRole].v[Role]
 
-  def systemUser: UserSteps = this.has("login", User.system.login)
+    def avatar: Traversal.V[Attachment] = traversal.out[UserAttachment].v[Attachment]
 
-  def dashboards: DashboardSteps = new DashboardSteps(raw.inTo[DashboardUser])
+    def systemUser: Traversal.V[User] = traversal.has("login", User.system.login)
 
-  def tasks: TaskSteps = new TaskSteps(raw.inTo[TaskUser])
+    def dashboards: Traversal.V[Dashboard] = traversal.in[DashboardUser].v[Dashboard]
 
-  def cases: CaseSteps = new CaseSteps(raw.inTo[CaseUser])
+    def tasks: Traversal.V[Task] = traversal.in[TaskUser].v[Task]
+
+    def cases: Traversal.V[Case] = traversal.in[CaseUser].v[Case]
+  }
 }
 
 @Singleton
@@ -342,7 +348,7 @@ class UserIntegrityCheckOps @Inject() (
       .filter(_.profile.getByName(Profile.admin.name))
       .organisation
       .getByName(Organisation.administration.name)
-      .exists()
+      .exists
     if (!adminUserIsCreated)
       for {
         adminUser         <- service.getOrFail(User.init.login)
@@ -356,10 +362,10 @@ class UserIntegrityCheckOps @Inject() (
   override def check(): Unit = {
     super.check()
     db.tryTransaction { implicit graph =>
-      duplicateInEdges[TaskUser](service.initSteps.raw).flatMap(firstCreatedElement(_)).foreach(e => removeEdges(e._2))
-      duplicateInEdges[CaseUser](service.initSteps.raw).flatMap(firstCreatedElement(_)).foreach(e => removeEdges(e._2))
+      duplicateInEdges[TaskUser](service.startTraversal).flatMap(firstCreatedElement(_)).foreach(e => removeEdges(e._2))
+      duplicateInEdges[CaseUser](service.startTraversal).flatMap(firstCreatedElement(_)).foreach(e => removeEdges(e._2))
       duplicateLinks[Vertex, Vertex](
-        service.initSteps.raw,
+        service.startTraversal,
         (_.out("UserRole"), _.in("UserRole")),
         (_.out("RoleOrganisation"), _.in("RoleOrganisation"))
       ).flatMap(firstCreatedElement(_)).foreach(e => removeVertices(e._2))
@@ -368,7 +374,7 @@ class UserIntegrityCheckOps @Inject() (
     ()
   }
 
-  override def resolve(entities: List[User with Entity])(implicit graph: Graph): Try[Unit] = {
+  override def resolve(entities: Seq[User with Entity])(implicit graph: Graph): Try[Unit] = {
     firstCreatedEntity(entities).foreach {
       case (firstUser, otherUsers) =>
         otherUsers.foreach(copyEdge(_, firstUser))
@@ -376,5 +382,4 @@ class UserIntegrityCheckOps @Inject() (
     }
     Success(())
   }
-
 }
diff --git a/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala b/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala
index e23d6c0b25..382b3b8e61 100644
--- a/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala
+++ b/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala
@@ -2,13 +2,16 @@ package org.thp.thehive.services.notification
 
 import akka.actor.{Actor, ActorIdentity, Identify}
 import akka.util.Timeout
-import gremlin.scala.Graph
 import javax.inject.{Inject, Named}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.BadConfigurationError
 import org.thp.scalligraph.models.{Database, Entity, Schema}
-import org.thp.scalligraph.services.{EventSrv, RichElement}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.services.EventSrv
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Audit, Organisation, User}
+import org.thp.thehive.services.AuditOps._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import org.thp.thehive.services.notification.notifiers.{Notifier, NotifierProvider}
 import org.thp.thehive.services.notification.triggers.{Trigger, TriggerProvider}
@@ -16,7 +19,6 @@ import play.api.cache.SyncCacheApi
 import play.api.libs.json.{Format, JsValue, Json}
 import play.api.{Configuration, Logger}
 
-import scala.collection.JavaConverters._
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
@@ -51,8 +53,8 @@ class NotificationSrv @Inject() (
       .asOpt[Seq[NotificationConfig]]
       .getOrElse(Nil)
 
-  def getTriggers(config: String): Seq[Trigger] =
-    getConfig(config).flatMap(n => getTrigger(n.triggerConfig).toOption)
+  def getTriggers(config: JsValue): Seq[Trigger] =
+    config.asOpt[Seq[NotificationConfig]].getOrElse(Nil).flatMap(c => getTrigger(c.triggerConfig).toOption)
 
   def getTrigger(config: Configuration): Try[Trigger] =
     for {
@@ -166,19 +168,12 @@ class NotificationActor @Inject() (
                         .getByIds(userIds: _*)
                         .project(
                           _.by
-                            .by(_.config("notification").value.fold)
+                            .by(_.config("notification").value(_.value).fold)
                         )
                         .toIterator
                         .foreach {
-                          case (userVertex, notificationConfig) =>
-                            val user = userVertex.as[User]
-                            val config = notificationConfig
-                              .asScala
-                              .flatMap(
-                                Json
-                                  .parse(_)
-                                  .asOpt[NotificationConfig]
-                              )
+                          case (user, notificationConfig) =>
+                            val config = notificationConfig.flatMap(_.asOpt[NotificationConfig])
                             executeNotification(Some(user), config, audit, context, obj, organisation)
                         }
                     if (inOrg) {
@@ -186,7 +181,7 @@ class NotificationActor @Inject() (
                         .get(organisation)
                         .config
                         .has("name", "notification")
-                        .value
+                        .value(_.value)
                         .toIterator
                         .foreach { notificationConfig: JsValue =>
                           val (userConfig, orgConfig) = notificationConfig
@@ -211,7 +206,7 @@ class NotificationActor @Inject() (
       }
     case NotificationExecution(userId, auditId, notificationConfig) =>
       db.roTransaction { implicit graph =>
-        auditSrv.getByIds(auditId).auditContextObjectOrganisation.getOrFail().foreach {
+        auditSrv.getByIds(auditId).auditContextObjectOrganisation.getOrFail("Audit").foreach {
           case (audit, context, obj, Some(organisation)) =>
             for {
               user    <- userId.map(userSrv.getOrFail).flip
diff --git a/thehive/app/org/thp/thehive/services/notification/notifiers/AppendToFile.scala b/thehive/app/org/thp/thehive/services/notification/notifiers/AppendToFile.scala
index bd80d8629e..52ae69a9f8 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/AppendToFile.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/AppendToFile.scala
@@ -3,9 +3,9 @@ package org.thp.thehive.services.notification.notifiers
 import java.nio.charset.Charset
 import java.nio.file.{Files, Paths, StandardOpenOption}
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
-import org.thp.scalligraph.models.Entity
+import org.apache.tinkerpop.gremlin.structure.Graph
+import org.thp.scalligraph.models.{Entity, Schema}
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.Configuration
@@ -14,7 +14,7 @@ import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 
 @Singleton
-class AppendToFileProvider @Inject() (appConfig: ApplicationConfig, ec: ExecutionContext) extends NotifierProvider {
+class AppendToFileProvider @Inject() (appConfig: ApplicationConfig, schema: Schema, ec: ExecutionContext) extends NotifierProvider {
   override val name: String = "AppendToFile"
 
   val templateConfig: ConfigItem[String, String] =
@@ -27,11 +27,11 @@ class AppendToFileProvider @Inject() (appConfig: ApplicationConfig, ec: Executio
     config.getOrFail[String]("file").map { filename =>
       val template = config.getOptional[String]("message").getOrElse(templateConfig.get)
       val charset  = config.getOptional[String]("charset").fold(Charset.defaultCharset())(Charset.forName)
-      new AppendToFile(filename, template, charset, baseUrlConfig.get, ec)
+      new AppendToFile(filename, template, charset, baseUrlConfig.get, schema, ec)
     }
 }
 
-class AppendToFile(filename: String, template: String, charset: Charset, baseUrl: String, implicit val ec: ExecutionContext)
+class AppendToFile(filename: String, template: String, charset: Charset, baseUrl: String, val schema: Schema, implicit val ec: ExecutionContext)
     extends Notifier
     with Template {
   override val name: String = "AppendToFile"
diff --git a/thehive/app/org/thp/thehive/services/notification/notifiers/Emailer.scala b/thehive/app/org/thp/thehive/services/notification/notifiers/Emailer.scala
index dff9901c77..e49c69be06 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Emailer.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Emailer.scala
@@ -1,8 +1,8 @@
 package org.thp.thehive.services.notification.notifiers
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
-import org.thp.scalligraph.models.Entity
+import org.apache.tinkerpop.gremlin.structure.Graph
+import org.thp.scalligraph.models.{Entity, Schema}
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.libs.mailer.{Email, MailerClient}
@@ -12,7 +12,8 @@ import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Success, Try}
 
 @Singleton
-class EmailerProvider @Inject() (appConfig: ApplicationConfig, mailerClient: MailerClient, ec: ExecutionContext) extends NotifierProvider {
+class EmailerProvider @Inject() (appConfig: ApplicationConfig, mailerClient: MailerClient, schema: Schema, ec: ExecutionContext)
+    extends NotifierProvider {
   override val name: String = "Emailer"
 
   val subjectConfig: ConfigItem[String, String] =
@@ -29,13 +30,20 @@ class EmailerProvider @Inject() (appConfig: ApplicationConfig, mailerClient: Mai
 
   override def apply(config: Configuration): Try[Notifier] = {
     val template = config.getOptional[String]("message").getOrElse(templateConfig.get)
-    val emailer  = new Emailer(mailerClient, subjectConfig.get, fromConfig.get, template, baseUrlConfig.get, ec)
+    val emailer  = new Emailer(mailerClient, subjectConfig.get, fromConfig.get, template, baseUrlConfig.get, schema, ec)
     Success(emailer)
   }
 }
 
-class Emailer(mailerClient: MailerClient, subject: String, from: String, template: String, baseUrl: String, implicit val ec: ExecutionContext)
-    extends Notifier
+class Emailer(
+    mailerClient: MailerClient,
+    subject: String,
+    from: String,
+    template: String,
+    baseUrl: String,
+    val schema: Schema,
+    implicit val ec: ExecutionContext
+) extends Notifier
     with Template {
   lazy val logger: Logger   = Logger(getClass)
   override val name: String = "Emailer"
diff --git a/thehive/app/org/thp/thehive/services/notification/notifiers/Mattermost.scala b/thehive/app/org/thp/thehive/services/notification/notifiers/Mattermost.scala
index 4259e10cea..97b6309158 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Mattermost.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Mattermost.scala
@@ -1,10 +1,10 @@
 package org.thp.thehive.services.notification.notifiers
 
 import akka.stream.Materializer
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.client.{ProxyWS, ProxyWSConfig}
-import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.models.{Entity, Schema}
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.libs.json.{Json, Reads, Writes}
@@ -21,7 +21,7 @@ object MattermostNotification {
 }
 
 @Singleton
-class MattermostProvider @Inject() (appConfig: ApplicationConfig, ec: ExecutionContext, mat: Materializer) extends NotifierProvider {
+class MattermostProvider @Inject() (appConfig: ApplicationConfig, ec: ExecutionContext, schema: Schema, mat: Materializer) extends NotifierProvider {
   override val name: String                            = "Mattermost"
   implicit val optionStringRead: Reads[Option[String]] = Reads.optionNoError[String]
 
@@ -46,12 +46,18 @@ class MattermostProvider @Inject() (appConfig: ApplicationConfig, ec: ExecutionC
     val usernameOverride = usernameConfig.get
     val webhook          = webhookConfig.get
     val mattermost =
-      new Mattermost(new ProxyWS(wsConfig.get, mat), MattermostNotification(template, webhook, channel, usernameOverride), baseUrlConfig.get, ec)
+      new Mattermost(
+        new ProxyWS(wsConfig.get, mat),
+        MattermostNotification(template, webhook, channel, usernameOverride),
+        baseUrlConfig.get,
+        schema,
+        ec
+      )
     Success(mattermost)
   }
 }
 
-class Mattermost(ws: WSClient, mattermostNotification: MattermostNotification, baseUrl: String, implicit val ec: ExecutionContext)
+class Mattermost(ws: WSClient, mattermostNotification: MattermostNotification, baseUrl: String, val schema: Schema, implicit val ec: ExecutionContext)
     extends Notifier
     with Template {
   lazy val logger: Logger   = Logger(getClass)
diff --git a/thehive/app/org/thp/thehive/services/notification/notifiers/Notifier.scala b/thehive/app/org/thp/thehive/services/notification/notifiers/Notifier.scala
index bf955faed9..59f4cdb569 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Notifier.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Notifier.scala
@@ -1,6 +1,6 @@
 package org.thp.thehive.services.notification.notifiers
 
-import gremlin.scala.Graph
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.BadConfigurationError
 import org.thp.scalligraph.models.Entity
 import org.thp.thehive.models.{Audit, Organisation, User}
diff --git a/thehive/app/org/thp/thehive/services/notification/notifiers/Template.scala b/thehive/app/org/thp/thehive/services/notification/notifiers/Template.scala
index 710665f615..ee9d65f483 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Template.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Template.scala
@@ -4,7 +4,7 @@ import java.util.{HashMap => JHashMap}
 
 import com.github.jknack.handlebars.Handlebars
 import com.github.jknack.handlebars.helper.ConditionalHelpers
-import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.models.{Entity, Schema}
 import org.thp.thehive.models.{Audit, User}
 
 import scala.collection.JavaConverters._
@@ -12,6 +12,7 @@ import scala.util.Try
 
 trait Template {
   val handlebars: Handlebars = new Handlebars().registerHelpers(classOf[ConditionalHelpers])
+  val schema: Schema
 
   /**
     * Retrieves the data from an Entity db model (XXX with Entity) as a scala Map
@@ -19,21 +20,24 @@ trait Template {
     * @return
     */
   private def getMap(cc: Entity): Map[String, String] =
-    cc._model
-      .fields
-      .keys
-      .filterNot(_ == "password")
-      .flatMap { f =>
-        cc.getClass.getSuperclass.getDeclaredMethod(f).invoke(cc) match {
-          case option: Option[_] => option.map(f -> _.toString)
-          case list: Seq[_]      => Some(f       -> list.mkString("[", ",", "]"))
-          case set: Set[_]       => Some(f       -> set.mkString("[", ",", "]"))
-          case other             => Some(f       -> other.toString)
-        }
-      }
-      .toMap +
+    schema
+      .getModel(cc._label)
+      .fold(Map.empty[String, String]) {
+        _.fields
+          .keys
+          .filterNot(_ == "password")
+          .flatMap { f =>
+            cc.getClass.getSuperclass.getDeclaredMethod(f).invoke(cc) match {
+              case option: Option[_] => option.map(f -> _.toString)
+              case list: Seq[_]      => Some(f       -> list.mkString("[", ",", "]"))
+              case set: Set[_]       => Some(f       -> set.mkString("[", ",", "]"))
+              case other             => Some(f       -> other.toString)
+            }
+          }
+          .toMap
+      } +
       ("_id"        -> cc._id) +
-      ("_type"      -> cc._model.label) +
+      ("_type"      -> cc._label) +
       ("_createdAt" -> cc._createdAt.toString) +
       ("_createdBy" -> cc._createdBy) +
       ("_updatedAt" -> cc._updatedAt.fold("never")(_.toString)) +
@@ -41,7 +45,7 @@ trait Template {
 
   def buildUrl(baseUrl: String, `object`: Option[Entity], context: Option[Entity]): Option[String] =
     `object`.flatMap { obj =>
-      obj._model.label match {
+      obj._label match {
         case "Case"             => Some(s"$baseUrl/index.html#/case/${obj._id}")
         case "Task"             => context.map(ctx => s"$baseUrl/index.html#/case/${ctx._id}/tasks/${obj._id}")
         case "Log"              => context.map(ctx => s"$baseUrl/index.html#/case/${ctx._id}")
diff --git a/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala b/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala
index 5d08cb0c3b..d004645668 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala
@@ -1,20 +1,28 @@
 package org.thp.thehive.services.notification.notifiers
 
+import java.util.{Date, Map => JMap}
+
 import akka.stream.Materializer
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
 import org.thp.client.{ProxyWS, ProxyWSConfig}
 import org.thp.scalligraph.BadConfigurationError
-import org.thp.scalligraph.models.{Entity, Schema}
+import org.thp.scalligraph.models.{Entity, Schema, UMapping}
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
-import org.thp.scalligraph.steps.StepsOps._
-import org.thp.scalligraph.steps.{BranchCase, BranchOtherwise, Traversal, VertexSteps}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal.{Converter, IdentityConverter, Traversal}
 import org.thp.thehive.controllers.v0.AuditRenderer
 import org.thp.thehive.controllers.v0.Conversion.fromObjectType
-import org.thp.thehive.models.{Audit, Organisation, User}
-import org.thp.thehive.services.{AuditSrv, AuditSteps, _}
+import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.AuditOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.LogOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.TaskOps._
+import org.thp.thehive.services.{AuditSrv, _}
 import play.api.libs.json.Json.WithDefaultValues
-import play.api.libs.json.{Format, JsObject, JsValue, Json}
+import play.api.libs.json._
 import play.api.{Configuration, Logger}
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -61,7 +69,7 @@ class WebhookProvider @Inject() (
         .find(_.name == name)
         .fold[Try[WebhookNotification]](Failure(BadConfigurationError(s"Webhook configuration `$name` not found`")))(Success.apply)
 
-    } yield new Webhook(config, auditSrv, customFieldSrv, mat, schema, ec)
+    } yield new Webhook(config, auditSrv, customFieldSrv, mat, ec)
 }
 
 class Webhook(
@@ -69,7 +77,6 @@ class Webhook(
     auditSrv: AuditSrv,
     customFieldSrv: CustomFieldSrv,
     mat: Materializer,
-    implicit val schema: Schema,
     implicit val ec: ExecutionContext
 ) extends Notifier {
   override val name: String = "webhook"
@@ -80,36 +87,87 @@ class Webhook(
 
   object v1 {
     import org.thp.thehive.controllers.v0.Conversion._
-    def caseToJson: VertexSteps[_ <: Product] => Traversal[JsValue, JsValue] =
-      _.asCase.richCaseWithoutPerms.map(_.toJson)
-
-    def taskToJson: VertexSteps[_ <: Product] => Traversal[JsValue, JsValue] =
-      _.asTask.richTask.map(_.toJson)
-
-    def alertToJson: VertexSteps[_ <: Product] => Traversal[JsValue, JsValue] =
-      _.asAlert.richAlert.map(_.toJson)
 
-    def logToJson: VertexSteps[_ <: Product] => Traversal[JsValue, JsValue] =
-      _.asLog.richLog.map(_.toJson)
-
-    def observableToJson: VertexSteps[_ <: Product] => Traversal[JsValue, JsValue] =
-      _.asObservable.richObservable.map(_.toJson)
-
-    def auditRenderer: AuditSteps => Traversal[JsValue, JsValue] =
-      (_: AuditSteps)
-        .coalesce[JsValue](
-          _.`object`
+    def caseToJson: Traversal.V[Case] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+      _.richCaseWithoutPerms.domainMap[JsObject](_.toJson.as[JsObject])
+
+    def taskToJson: Traversal.V[Task] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+      _.project(
+        _.by(_.richTask.domainMap(_.toJson))
+          .by(t => caseToJson(t.`case`))
+      ).domainMap {
+        case (task, case0) => task.as[JsObject] + ("case" -> case0)
+      }
+
+    def alertToJson: Traversal.V[Alert] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+      _.richAlert.domainMap(_.toJson.as[JsObject])
+
+    def logToJson: Traversal.V[Log] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+      _.project(
+        _.by(_.richLog.domainMap(_.toJson))
+          .by(l => taskToJson(l.task))
+      ).domainMap { case (log, task) => log.as[JsObject] + ("case_task" -> task) }
+
+    def observableToJson: Traversal.V[Observable] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+      _.project(
+        _.by(_.richObservable.domainMap(_.toJson))
+          .by(_.coalesce(o => caseToJson(o.`case`), o => alertToJson(o.alert)))
+      ).domainMap {
+        case (obs, caseOrAlert) => obs.as[JsObject] + ((caseOrAlert \ "_type").asOpt[String].getOrElse("<unknown>") -> caseOrAlert)
+      }
+
+    case class Job(
+        workerId: String,
+        workerName: String,
+        workerDefinition: String,
+        status: String,
+        startDate: Date,
+        endDate: Date,
+        report: Option[JsObject],
+        cortexId: String,
+        cortexJobId: String
+    )
+    def jobToJson
+        : Traversal[Vertex, Vertex, IdentityConverter[Vertex]] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+      _.project(
+        _.by.by
+      ).domainMap {
+        case (vertex, _) =>
+          JsObject(
+            UMapping.string.optional.getProperty(vertex, "workerId").map(v => "analyzerId"                   -> JsString(v)).toList :::
+              UMapping.string.optional.getProperty(vertex, "workerName").map(v => "analyzerName"             -> JsString(v)).toList :::
+              UMapping.string.optional.getProperty(vertex, "workerDefinition").map(v => "analyzerDefinition" -> JsString(v)).toList :::
+              UMapping.string.optional.getProperty(vertex, "status").map(v => "status"                       -> JsString(v)).toList :::
+              UMapping.date.optional.getProperty(vertex, "startDate").map(v => "startDate"                   -> JsNumber(v.getTime)).toList :::
+              UMapping.date.optional.getProperty(vertex, "endDate").map(v => "endDate"                       -> JsNumber(v.getTime)).toList :::
+              UMapping.string.optional.getProperty(vertex, "cortexId").map(v => "cortexId"                   -> JsString(v)).toList :::
+              UMapping.string.optional.getProperty(vertex, "cortexJobId").map(v => "cortexJobId"             -> JsString(v)).toList :::
+              UMapping.string.optional.getProperty(vertex, "_createdBy").map(v => "_createdBy"               -> JsString(v)).toList :::
+              UMapping.date.optional.getProperty(vertex, "_createdAt").map(v => "_createdAt"                 -> JsNumber(v.getTime)).toList :::
+              UMapping.string.optional.getProperty(vertex, "_updatedBy").map(v => "_updatedBy"               -> JsString(v)).toList :::
+              UMapping.date.optional.getProperty(vertex, "_updatedAt").map(v => "_updatedAt"                 -> JsNumber(v.getTime)).toList :::
+              UMapping.string.optional.getProperty(vertex, "_type").map(v => "_type"                         -> JsString(v)).toList :::
+              UMapping.string.optional.getProperty(vertex, "_id").map(v => "_id"                             -> JsString(v)).toList
+          )
+      }
+
+    def auditRenderer: Traversal.V[Audit] => Traversal[JsObject, JMap[String, Any], Converter[JsObject, JMap[String, Any]]] =
+      (_: Traversal.V[Audit])
+        .coalesce(
+          _.`object` //.out[Audited]
             .choose(
-              on = _.label,
-              BranchCase("Case", caseToJson),
-              BranchCase("Task", taskToJson),
-              BranchCase("Log", logToJson),
-              BranchCase("Observable", observableToJson),
-              BranchCase("Alert", alertToJson),
-              BranchOtherwise(_.constant(JsObject.empty))
+              _.on(_.label)
+                .option("Case", t => caseToJson(t.v[Case]))
+                .option("Task", t => taskToJson(t.v[Task]))
+                .option("Log", t => logToJson(t.v[Log]))
+                .option("Observable", t => observableToJson(t.v[Observable]))
+                .option("Alert", t => alertToJson(t.v[Alert]))
+                .option("Job", jobToJson)
+                .none(_.constant2[JsObject, JMap[String, Any]](JsObject.empty))
             ),
-          _.constant(JsObject.empty)
+          _.constant2[JsObject, JMap[String, Any]](JsObject.empty)
         )
+
   }
 
   // This method change the format of audit details when it contains custom field.
@@ -135,9 +193,9 @@ class Webhook(
   def buildMessage(version: Int, audit: Audit with Entity)(implicit graph: Graph): Try[JsObject] =
     version match {
       case 0 =>
-        auditSrv.get(audit).richAuditWithCustomRenderer(v0.auditRenderer).getOrFail().map {
+        auditSrv.get(audit).richAuditWithCustomRenderer(v0.auditRenderer).getOrFail("Audit").map {
           case (audit, obj) =>
-            val objectType = audit.objectType.getOrElse(audit.context._model.label)
+            val objectType = audit.objectType.getOrElse(audit.context._label)
             Json.obj(
               "operation"  -> audit.action,
               "details"    -> audit.details.fold[JsValue](JsObject.empty)(fixCustomFieldDetails(objectType, _)),
@@ -151,9 +209,9 @@ class Webhook(
             )
         }
       case 1 =>
-        auditSrv.get(audit).richAuditWithCustomRenderer(v1.auditRenderer).getOrFail().map {
+        auditSrv.get(audit).richAuditWithCustomRenderer(v1.auditRenderer).getOrFail("Audit").map {
           case (audit, obj) =>
-            val objectType = audit.objectType.getOrElse(audit.context._model.label)
+            val objectType = audit.objectType.getOrElse(audit.context._label)
             Json.obj(
               "operation"  -> audit.action,
               "details"    -> audit.details.fold[JsValue](JsObject.empty)(fixCustomFieldDetails(objectType, _)),
diff --git a/thehive/app/org/thp/thehive/services/notification/triggers/CaseCreated.scala b/thehive/app/org/thp/thehive/services/notification/triggers/CaseCreated.scala
index 7f3ed326fa..484b530d52 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/CaseCreated.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/CaseCreated.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.services.notification.triggers
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.Configuration
diff --git a/thehive/app/org/thp/thehive/services/notification/triggers/FilteredEvent.scala b/thehive/app/org/thp/thehive/services/notification/triggers/FilteredEvent.scala
index b1e6b85571..d7ff6db5d7 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/FilteredEvent.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/FilteredEvent.scala
@@ -1,8 +1,8 @@
 package org.thp.thehive.services.notification.triggers
 
 import com.typesafe.config.ConfigRenderOptions
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.Configuration
diff --git a/thehive/app/org/thp/thehive/services/notification/triggers/GlobalTrigger.scala b/thehive/app/org/thp/thehive/services/notification/triggers/GlobalTrigger.scala
index 49768906fa..e728493570 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/GlobalTrigger.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/GlobalTrigger.scala
@@ -1,6 +1,6 @@
 package org.thp.thehive.services.notification.triggers
 
-import gremlin.scala.Graph
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
 import org.thp.thehive.models.{Audit, Organisation, User}
 
diff --git a/thehive/app/org/thp/thehive/services/notification/triggers/LogInMyTask.scala b/thehive/app/org/thp/thehive/services/notification/triggers/LogInMyTask.scala
index 7771f6dc95..792e978746 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/LogInMyTask.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/LogInMyTask.scala
@@ -1,11 +1,13 @@
 package org.thp.thehive.services.notification.triggers
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Audit, Organisation, User}
+import org.thp.thehive.services.LogOps._
 import org.thp.thehive.services.LogSrv
+import org.thp.thehive.services.TaskOps._
 import play.api.Configuration
 
 import scala.util.{Success, Try}
@@ -32,5 +34,5 @@ class LogInMyTask(logSrv: LogSrv) extends Trigger {
       audit.objectId.fold(false)(taskAssignee(_).fold(false)(_ == u.login))
     }
 
-  def taskAssignee(logId: String)(implicit graph: Graph): Option[String] = logSrv.getByIds(logId).task.assignee.login.headOption()
+  def taskAssignee(logId: String)(implicit graph: Graph): Option[String] = logSrv.getByIds(logId).task.assignee.value(_.login).headOption
 }
diff --git a/thehive/app/org/thp/thehive/services/notification/triggers/TaskAssigned.scala b/thehive/app/org/thp/thehive/services/notification/triggers/TaskAssigned.scala
index 8e4c49f042..7dcf2dd331 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/TaskAssigned.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/TaskAssigned.scala
@@ -1,10 +1,11 @@
 package org.thp.thehive.services.notification.triggers
 
-import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Audit, Organisation, User}
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services.TaskSrv
 import play.api.Configuration
 
@@ -32,5 +33,5 @@ class TaskAssigned(taskSrv: TaskSrv) extends Trigger {
   }
 
   def taskAssignee(taskId: String, login: String)(implicit graph: Graph): Option[User with Entity] =
-    taskSrv.getByIds(taskId).assignee.has("login", login).headOption()
+    taskSrv.getByIds(taskId).assignee.has("login", login).headOption
 }
diff --git a/thehive/app/org/thp/thehive/services/notification/triggers/Trigger.scala b/thehive/app/org/thp/thehive/services/notification/triggers/Trigger.scala
index 9ecbf381fc..2224dd846f 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/Trigger.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/Trigger.scala
@@ -1,6 +1,6 @@
 package org.thp.thehive.services.notification.triggers
 
-import gremlin.scala.Graph
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.BadConfigurationError
 import org.thp.scalligraph.models.Entity
 import org.thp.thehive.models.{Audit, Organisation, User}
diff --git a/thehive/app/org/thp/thehive/services/package.scala b/thehive/app/org/thp/thehive/services/package.scala
index 103b8d85d3..e0d654e7dd 100644
--- a/thehive/app/org/thp/thehive/services/package.scala
+++ b/thehive/app/org/thp/thehive/services/package.scala
@@ -1,29 +1,29 @@
-package org.thp.thehive
-
-import org.thp.scalligraph.steps.VertexSteps
-
-package object services {
-
-  implicit class EntityStepsOps[E <: Product](steps: VertexSteps[E]) {
-    def asCase: CaseSteps = steps match {
-      case caseSteps: CaseSteps => caseSteps
-      case _                    => new CaseSteps(steps.raw)(steps.db, steps.graph)
-    }
-    def asTask: TaskSteps = steps match {
-      case taskSteps: TaskSteps => taskSteps
-      case _                    => new TaskSteps(steps.raw)(steps.db, steps.graph)
-    }
-    def asLog: LogSteps = steps match {
-      case logSteps: LogSteps => logSteps
-      case _                  => new LogSteps(steps.raw)(steps.db, steps.graph)
-    }
-    def asObservable: ObservableSteps = steps match {
-      case observableSteps: ObservableSteps => observableSteps
-      case _                                => new ObservableSteps(steps.raw)(steps.db, steps.graph)
-    }
-    def asAlert: AlertSteps = steps match {
-      case alertSteps: AlertSteps => alertSteps
-      case _                      => new AlertSteps(steps.raw)(steps.db, steps.graph)
-    }
-  }
-}
+//package org.thp.thehive
+//
+//import org.thp.scalligraph.steps.VertexSteps
+//
+//package object services {
+//
+//  implicit class EntityStepsOps[E <: Product](steps: Traversal.V[Vertex][E]) {
+//    def asCase: Traversal.V[Case] = steps match {
+//      case caseSteps: Traversal.V[Case] => caseSteps
+//      case _                    => new CaseSteps(steps.raw)(steps.db, steps.graph)
+//    }
+//    def asTask: Traversal.V[Task] = steps match {
+//      case taskSteps: Traversal.V[Task] => taskSteps
+//      case _                    => new TaskSteps(steps.raw)(steps.db, steps.graph)
+//    }
+//    def asLog: Traversal.V[Log] = steps match {
+//      case logSteps: Traversal.V[Log] => logSteps
+//      case _                  => new LogSteps(steps.raw)(steps.db, steps.graph)
+//    }
+//    def asObservable: Traversal.V[Observable] = steps match {
+//      case observableSteps: Traversal.V[Observable] => observableSteps
+//      case _                                => new ObservableSteps(steps.raw)(steps.db, steps.graph)
+//    }
+//    def asAlert: Traversal.V[Alert] = steps match {
+//      case alertSteps: Traversal.V[Alert] => alertSteps
+//      case _                      => new AlertSteps(steps.raw)(steps.db, steps.graph)
+//    }
+//  }
+//}
diff --git a/thehive/app/org/thp/thehive/services/th3/Aggregation.scala b/thehive/app/org/thp/thehive/services/th3/Aggregation.scala
new file mode 100644
index 0000000000..02ee3d9fb8
--- /dev/null
+++ b/thehive/app/org/thp/thehive/services/th3/Aggregation.scala
@@ -0,0 +1,398 @@
+package org.thp.thehive.services.th3
+
+import java.lang.{Long => JLong}
+import java.time.temporal.ChronoUnit
+import java.util.{Calendar, Date, List => JList}
+
+import org.apache.tinkerpop.gremlin.process.traversal.Order
+import org.scalactic.Accumulation._
+import org.scalactic._
+import org.thp.scalligraph.InvalidFormatAttributeError
+import org.thp.scalligraph.auth.AuthContext
+import org.thp.scalligraph.controllers._
+import org.thp.scalligraph.models.Database
+import org.thp.scalligraph.query.{Aggregation, PublicProperty}
+import org.thp.scalligraph.traversal.TraversalOps._
+import org.thp.scalligraph.traversal._
+import play.api.Logger
+import play.api.libs.json.{JsNull, JsNumber, JsObject, Json}
+
+import scala.reflect.runtime.{universe => ru}
+import scala.util.Try
+import scala.util.matching.Regex
+
+object TH3Aggregation {
+
+  object AggObj {
+    def unapply(field: Field): Option[(String, FObject)] =
+      field match {
+        case f: FObject =>
+          f.get("_agg") match {
+            case FString(name) => Some(name -> (f - "_agg"))
+            case _             => None
+          }
+        case _ => None
+      }
+  }
+
+  val intervalParser: FieldsParser[(Long, ChronoUnit)] = FieldsParser[(Long, ChronoUnit)]("interval") {
+    case (_, f) =>
+      withGood(
+        FieldsParser.long.optional.on("_interval")(f),
+        FieldsParser[ChronoUnit]("chronoUnit") {
+          case (_, f @ FString(value)) =>
+            Or.from(
+              Try(ChronoUnit.valueOf(value)).toOption,
+              One(InvalidFormatAttributeError("_unit", "chronoUnit", ChronoUnit.values.toSet.map((_: ChronoUnit).toString), f))
+            )
+        }.on("_unit")(f)
+      )((i, u) => i.getOrElse(0L) -> u)
+  }
+
+  val intervalRegex: Regex = "(\\d+)([smhdwMy])".r
+
+  val mergedIntervalParser: FieldsParser[(Long, ChronoUnit)] = FieldsParser[(Long, ChronoUnit)]("interval") {
+    case (_, FString(intervalRegex(interval, unit))) =>
+      Good(unit match {
+        case "s" => interval.toLong -> ChronoUnit.SECONDS
+        case "m" => interval.toLong -> ChronoUnit.MINUTES
+        case "h" => interval.toLong -> ChronoUnit.HOURS
+        case "d" => interval.toLong -> ChronoUnit.DAYS
+        case "w" => interval.toLong -> ChronoUnit.WEEKS
+        case "M" => interval.toLong -> ChronoUnit.MONTHS
+        case "y" => interval.toLong -> ChronoUnit.YEARS
+      })
+  }
+
+  def aggregationFieldParser: PartialFunction[String, FieldsParser[Aggregation]] = {
+    case "field" =>
+      FieldsParser("FieldAggregation") {
+        case (_, field) =>
+          withGood(
+            FieldsParser.string.optional.on("_name")(field),
+            FieldsParser.string.on("_field")(field),
+            FieldsParser.string.sequence.on("_order")(field).orElse(FieldsParser.string.on("_order").map("order")(Seq(_))(field)),
+            FieldsParser.long.optional.on("_size")(field),
+            fieldsParser.sequence.on("_select")(field)
+          )((aggName, fieldName, order, size, subAgg) => FieldAggregation(aggName, fieldName, order, size, subAgg))
+      }
+    case "count" =>
+      FieldsParser("CountAggregation") {
+        case (_, field) => FieldsParser.string.optional.on("_name")(field).map(aggName => AggCount(aggName))
+      }
+    case "time" =>
+      FieldsParser("TimeAggregation") {
+        case (_, field) =>
+          withGood(
+            FieldsParser.string.optional.on("_name")(field),
+            FieldsParser
+              .string
+              .sequence
+              .on("_fields")(field)
+              .orElse(FieldsParser.string.on("_fields")(field).map(Seq(_))), //.map("toSeq")(f => Good(Seq(f)))),
+            mergedIntervalParser.on("_interval").orElse(intervalParser)(field),
+            fieldsParser.sequence.on("_select")(field)
+          ) { (aggName, fieldNames, intervalUnit, subAgg) =>
+            if (fieldNames.lengthCompare(1) > 0)
+              logger.warn(s"Only one field is supported for time aggregation (aggregation $aggName, ${fieldNames.tail.mkString(",")} are ignored)")
+            TimeAggregation(aggName, fieldNames.head, intervalUnit._1, intervalUnit._2, subAgg)
+          }
+      }
+    case "avg" =>
+      FieldsParser("AvgAggregation") {
+        case (_, field) =>
+          withGood(
+            FieldsParser.string.optional.on("_name")(field),
+            FieldsParser.string.on("_field")(field)
+          )((aggName, fieldName) => AggAvg(aggName, fieldName))
+      }
+    case "min" =>
+      FieldsParser("MinAggregation") {
+        case (_, field) =>
+          withGood(
+            FieldsParser.string.optional.on("_name")(field),
+            FieldsParser.string.on("_field")(field)
+          )((aggName, fieldName) => AggMin(aggName, fieldName))
+      }
+    case "max" =>
+      FieldsParser("MaxAggregation") {
+        case (_, field) =>
+          withGood(
+            FieldsParser.string.optional.on("_name")(field),
+            FieldsParser.string.on("_field")(field)
+          )((aggName, fieldName) => AggMax(aggName, fieldName))
+      }
+    case "sum" =>
+      FieldsParser("SumAggregation") {
+        case (_, field) =>
+          withGood(
+            FieldsParser.string.optional.on("_name")(field),
+            FieldsParser.string.on("_field")(field)
+          )((aggName, fieldName) => AggSum(aggName, fieldName))
+      }
+    case other =>
+      new FieldsParser[Aggregation](
+        "unknownAttribute",
+        Set.empty,
+        {
+          case (path, _) =>
+            Bad(One(InvalidFormatAttributeError(path.toString, "string", Set("field", "time", "count", "avg", "min", "max"), FString(other))))
+        }
+      )
+  }
+
+  implicit val fieldsParser: FieldsParser[Aggregation] = FieldsParser("aggregation") {
+    case (_, AggObj(name, field)) => aggregationFieldParser(name)(field)
+  }
+}
+
+case class AggSum(aggName: Option[String], fieldName: String) extends Aggregation(s"sum_$fieldName") {
+  override def getTraversal(
+      db: Database,
+      publicProperties: List[PublicProperty[_, _]],
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
+      authContext: AuthContext
+  ): Traversal.Domain[Output[_]] = {
+    val property = PublicProperty.getProperty(publicProperties, traversalType, fieldName)
+    traversal.coalesce(
+      t =>
+        property
+          .select(FPath(fieldName), t)
+          .sum
+          .domainMap(sum => Output(Json.obj(name -> JsNumber(BigDecimal(sum.toString)))))
+          .castDomain[Output[_]],
+      _.constant2(Output(Json.obj(name -> JsNull)))
+    )
+  }
+}
+case class AggAvg(aggName: Option[String], fieldName: String) extends Aggregation(s"sum_$fieldName") {
+  override def getTraversal(
+      db: Database,
+      publicProperties: List[PublicProperty[_, _]],
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
+      authContext: AuthContext
+  ): Traversal.Domain[Output[_]] = {
+    val property = PublicProperty.getProperty(publicProperties, traversalType, fieldName)
+    traversal.coalesce(
+      t =>
+        property
+          .select(FPath(fieldName), t)
+          .mean
+          .domainMap(avg => Output(Json.obj(name -> avg.asInstanceOf[Double]))),
+      _.constant2(Output(Json.obj(name -> JsNull)))
+    )
+  }
+}
+
+case class AggMin(aggName: Option[String], fieldName: String) extends Aggregation(s"min_$fieldName") {
+  override def getTraversal(
+      db: Database,
+      publicProperties: List[PublicProperty[_, _]],
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
+      authContext: AuthContext
+  ): Traversal.Domain[Output[_]] = {
+    val property = PublicProperty.getProperty(publicProperties, traversalType, fieldName)
+    traversal.coalesce(
+      t =>
+        property
+          .select(FPath(fieldName), t)
+          .min
+          .domainMap(min => Output(Json.obj(name -> property.mapping.selectRenderer.toJson(min)))),
+      _.constant2(Output(Json.obj(name -> JsNull)))
+    )
+  }
+}
+
+case class AggMax(aggName: Option[String], fieldName: String) extends Aggregation(s"max_$fieldName") {
+  override def getTraversal(
+      db: Database,
+      publicProperties: List[PublicProperty[_, _]],
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
+      authContext: AuthContext
+  ): Traversal.Domain[Output[_]] = {
+    val property = PublicProperty.getProperty(publicProperties, traversalType, fieldName)
+    traversal.coalesce(
+      t =>
+        property
+          .select(FPath(fieldName), t)
+          .max
+          .domainMap(max => Output(Json.obj(name -> property.mapping.selectRenderer.toJson(max)))),
+      _.constant2(Output(Json.obj(name -> JsNull)))
+    )
+  }
+}
+
+case class AggCount(aggName: Option[String]) extends Aggregation(aggName.getOrElse("count")) {
+  override def getTraversal(
+      db: Database,
+      publicProperties: List[PublicProperty[_, _]],
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
+      authContext: AuthContext
+  ): Traversal.Domain[Output[_]] =
+    traversal
+      .count
+      .domainMap(count => Output(Json.obj(name -> count)))
+      .castDomain[Output[_]]
+}
+
+//case class AggTop[T](fieldName: String) extends AggFunction[T](s"top_$fieldName")
+
+case class FieldAggregation(
+    aggName: Option[String],
+    fieldName: String,
+    orders: Seq[String],
+    size: Option[Long],
+    subAggs: Seq[Aggregation]
+) extends Aggregation(aggName.getOrElse(s"field_$fieldName")) {
+  lazy val logger: Logger = Logger(getClass)
+
+  override def getTraversal(
+      db: Database,
+      publicProperties: List[PublicProperty[_, _]],
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
+      authContext: AuthContext
+  ): Traversal.Domain[Output[_]] = {
+    val label           = StepLabel[Traversal.UnkD, Traversal.UnkG, Converter[Traversal.UnkD, Traversal.UnkG]]
+    val property        = PublicProperty.getProperty(publicProperties, traversalType, fieldName)
+    val groupedVertices = property.select(FPath(fieldName), traversal.as(label)).group(_.by, _.by(_.select(label).fold)).unfold
+    //    val groupedVertices = traversal.group(_.by(t => property.select(FPath(fieldName), t).cast[Any, Any])).unfold
+    val sortedAndGroupedVertex = orders
+      .map {
+        case order if order.headOption.contains('-') => order.tail -> Order.desc
+        case order if order.headOption.contains('+') => order.tail -> Order.asc
+        case order                                   => order      -> Order.asc
+      }
+      .foldLeft(groupedVertices) {
+        case (acc, (field, order)) if field == fieldName => acc.sort(_.by(_.selectKeys, order))
+        case (acc, (field, order)) if field == "count"   => acc.sort(_.by(_.selectValues.localCount, order))
+        case (acc, (field, _)) =>
+          logger.warn(s"In field aggregation you can only sort by the field ($fieldName) or by count, not by $field")
+          acc
+      }
+    val sizedSortedAndGroupedVertex = size.fold(sortedAndGroupedVertex)(sortedAndGroupedVertex.limit)
+    val subAggProjection = subAggs.map {
+      agg => (s: GenericBySelector[Seq[Traversal.UnkD], JList[Traversal.UnkG], Converter.CList[Traversal.UnkD, Traversal.UnkG, Converter[
+        Traversal.UnkD,
+        Traversal.UnkG
+      ]]]) =>
+        s.by(t => agg.getTraversal(db, publicProperties, traversalType, t.unfold, authContext).castDomain[Output[_]])
+    }
+
+    sizedSortedAndGroupedVertex
+      .project(
+        _.by(_.selectKeys)
+          .by(
+            _.selectValues
+              .flatProject(subAggProjection: _*)
+              .domainMap { aggResult =>
+                Output(
+                  aggResult
+                    .asInstanceOf[Seq[Output[JsObject]]]
+                    .map(_.toValue)
+                    .reduceOption(_ deepMerge _)
+                    .getOrElse(JsObject.empty)
+                )
+              }
+          )
+      )
+      .fold
+      .domainMap(x => Output(JsObject(x.map(kv => kv._1.toString -> kv._2.toJson))))
+      .castDomain[Output[_]]
+  }
+}
+
+case class TimeAggregation(
+    aggName: Option[String],
+    fieldName: String,
+    interval: Long,
+    unit: ChronoUnit,
+    subAggs: Seq[Aggregation]
+) extends Aggregation(aggName.getOrElse(s"time_$fieldName")) {
+  val calendar: Calendar = Calendar.getInstance()
+
+  def dateToKey(date: Date): Long =
+    unit match {
+      case ChronoUnit.WEEKS =>
+        calendar.setTime(date)
+        val year = calendar.get(Calendar.YEAR)
+        val week = (calendar.get(Calendar.WEEK_OF_YEAR) / interval) * interval
+        calendar.setTimeInMillis(0)
+        calendar.set(Calendar.YEAR, year)
+        calendar.set(Calendar.WEEK_OF_YEAR, week.toInt)
+        calendar.getTimeInMillis
+
+      case ChronoUnit.MONTHS =>
+        calendar.setTime(date)
+        val year  = calendar.get(Calendar.YEAR)
+        val month = (calendar.get(Calendar.MONTH) / interval) * interval
+        calendar.setTimeInMillis(0)
+        calendar.set(Calendar.YEAR, year)
+        calendar.set(Calendar.MONTH, month.toInt)
+        calendar.getTimeInMillis
+
+      case ChronoUnit.YEARS =>
+        calendar.setTime(date)
+        val year = (calendar.get(Calendar.YEAR) / interval) * interval
+        calendar.setTimeInMillis(0)
+        calendar.set(Calendar.YEAR, year.toInt)
+        calendar.getTimeInMillis
+
+      case other =>
+        val duration = other.getDuration.toMillis * interval
+        (date.getTime / duration) * duration
+    }
+
+  def keyToDate(key: Long): Date = new Date(key)
+
+  override def getTraversal(
+      db: Database,
+      publicProperties: List[PublicProperty[_, _]],
+      traversalType: ru.Type,
+      traversal: Traversal.Unk,
+      authContext: AuthContext
+  ): Traversal.Domain[Output[_]] = {
+    val property = PublicProperty.getProperty(publicProperties, traversalType, fieldName)
+    val label    = StepLabel[Traversal.UnkD, Traversal.UnkG, Converter[Traversal.UnkD, Traversal.UnkG]]
+    val groupedVertex = property
+      .select(FPath(fieldName), traversal.as(label))
+      .cast[Date, Date]
+      .graphMap[Long, JLong, Converter[Long, JLong]](dateToKey, Converter.long)
+      .group(_.by, _.by(_.select(label).fold))
+      .unfold
+    val subAggProjection = subAggs.map {
+      agg => (s: GenericBySelector[
+        Seq[Traversal.UnkD],
+        JList[Traversal.UnkG],
+        Converter.CList[Traversal.UnkD, Traversal.UnkG, Converter[Traversal.UnkD, Traversal.UnkG]]
+      ]) =>
+        s.by(t => agg.getTraversal(db, publicProperties, traversalType, t.unfold, authContext).castDomain[Output[_]])
+    }
+
+    groupedVertex
+      .project(
+        _.by(_.selectKeys)
+          .by(
+            _.selectValues
+              .flatProject(subAggProjection: _*)
+              .domainMap { aggResult =>
+                Output(
+                  aggResult
+                    .asInstanceOf[Seq[Output[JsObject]]]
+                    .map(_.toValue)
+                    .reduceOption(_ deepMerge _)
+                    .getOrElse(JsObject.empty)
+                )
+              }
+          )
+      )
+      .fold
+      .domainMap(x => Output(x.map(kv => kv._1 -> kv._2.toValue).toMap, JsObject(x.map(kv => kv._1.toString -> Json.obj(fieldName -> kv._2.toJson)))))
+      .castDomain[Output[_]]
+  }
+}
diff --git a/thehive/test/org/thp/thehive/DatabaseBuilder.scala b/thehive/test/org/thp/thehive/DatabaseBuilder.scala
index 25c8695aa4..516d41913b 100644
--- a/thehive/test/org/thp/thehive/DatabaseBuilder.scala
+++ b/thehive/test/org/thp/thehive/DatabaseBuilder.scala
@@ -2,8 +2,8 @@ package org.thp.thehive
 
 import java.io.File
 
-import gremlin.scala.{KeyValue => _, _}
 import javax.inject.{Inject, Singleton}
+import org.apache.tinkerpop.gremlin.structure.Graph
 import org.scalactic.Or
 import org.thp.scalligraph.RichOption
 import org.thp.scalligraph.auth.AuthContext
@@ -192,7 +192,7 @@ class DatabaseBuilder @Inject() (
   }
 
   def createVertex[V <: Product](
-      srv: VertexSrv[V, _],
+      srv: VertexSrv[V],
       parser: FieldsParser[V]
   )(implicit graph: Graph, authContext: AuthContext): Map[String, String] =
     readJsonFile(s"data/${srv.model.label}.json").flatMap { fields =>
@@ -205,8 +205,8 @@ class DatabaseBuilder @Inject() (
 
   def createEdge[E <: Product, FROM <: Product: ru.TypeTag, TO <: Product: ru.TypeTag](
       srv: EdgeSrv[E, FROM, TO],
-      fromSrv: VertexSrv[FROM, _],
-      toSrv: VertexSrv[TO, _],
+      fromSrv: VertexSrv[FROM],
+      toSrv: VertexSrv[TO],
       parser: FieldsParser[E],
       idMap: Map[String, String]
   )(implicit graph: Graph, authContext: AuthContext): Seq[E with Entity] =
diff --git a/thehive/test/org/thp/thehive/TestAppBuilder.scala b/thehive/test/org/thp/thehive/TestAppBuilder.scala
index a27c4a41bf..3c221efc07 100644
--- a/thehive/test/org/thp/thehive/TestAppBuilder.scala
+++ b/thehive/test/org/thp/thehive/TestAppBuilder.scala
@@ -14,23 +14,7 @@ import org.thp.scalligraph.{janus, AppBuilder}
 import org.thp.thehive.models.TheHiveSchemaDefinition
 import org.thp.thehive.services.notification.notifiers.{AppendToFileProvider, EmailerProvider, NotifierProvider}
 import org.thp.thehive.services.notification.triggers._
-import org.thp.thehive.services.{
-  CaseIntegrityCheckOps,
-  CaseTemplateIntegrityCheckOps,
-  CustomFieldIntegrityCheckOps,
-  DataIntegrityCheckOps,
-  FlowActor,
-  ImpactStatusIntegrityCheckOps,
-  LocalKeyAuthProvider,
-  LocalPasswordAuthProvider,
-  LocalUserSrv,
-  ObservableTypeIntegrityCheckOps,
-  OrganisationIntegrityCheckOps,
-  ProfileIntegrityCheckOps,
-  ResolutionStatusIntegrityCheckOps,
-  TagIntegrityCheckOps,
-  UserIntegrityCheckOps
-}
+import org.thp.thehive.services.{UserSrv => _, _}
 
 import scala.util.Try
 
@@ -69,7 +53,7 @@ trait TestAppBuilder {
       .bindActor[DummyActor]("config-actor")
       .bindActor[DummyActor]("notification-actor")
       .bindActor[DummyActor]("integrity-check-actor")
-      .bindActor[FlowActor]("flow-actor")
+      .bindActor[DummyActor]("flow-actor")
       .addConfiguration("auth.providers = [{name:local},{name:key},{name:header, userHeader:user}]")
       .addConfiguration("play.modules.disabled = [org.thp.scalligraph.ScalligraphModule, org.thp.thehive.TheHiveModule]")
       .addConfiguration("play.mailer.mock = yes")
diff --git a/thehive/test/org/thp/thehive/controllers/v0/AlertCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/AlertCtrlTest.scala
index bf9ad0d656..6e37b1896c 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/AlertCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/AlertCtrlTest.scala
@@ -4,11 +4,13 @@ import java.util.Date
 
 import io.scalaland.chimney.dsl._
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0._
 import org.thp.thehive.models.RichObservable
+import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services.CaseSrv
+import org.thp.thehive.services.ObservableOps._
 import play.api.libs.json.{JsNull, JsObject, JsString, Json}
 import play.api.test.{FakeRequest, PlaySpecification}
 
diff --git a/thehive/test/org/thp/thehive/controllers/v0/AuditCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/AuditCtrlTest.scala
index 260ef0599e..14e7ea923e 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/AuditCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/AuditCtrlTest.scala
@@ -2,15 +2,21 @@ package org.thp.thehive.controllers.v0
 
 import java.util.Date
 
+import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models.{Case, CaseStatus, Permissions}
-import org.thp.thehive.services.{CaseSrv, OrganisationSrv}
+import org.thp.thehive.services.{CaseSrv, FlowActor, OrganisationSrv}
 import play.api.libs.json.JsObject
 import play.api.test.{FakeRequest, PlaySpecification}
 
 class AuditCtrlTest extends PlaySpecification with TestAppBuilder {
+  override def appConfigure: AppBuilder =
+    super
+      .appConfigure
+      .`override`(_.bindActor[FlowActor]("flow-actor"))
+
   val authContext: AuthContext = DummyUserSrv(userId = "certuser@thehive.local", organisation = "cert", permissions = Permissions.all).authContext
 
   "return a list of audits including the last created one" in testApp { app =>
diff --git a/thehive/test/org/thp/thehive/controllers/v0/CaseCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/CaseCtrlTest.scala
index 40e8a684f4..3a550056d3 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/CaseCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/CaseCtrlTest.scala
@@ -5,9 +5,10 @@ import java.util.Date
 import akka.stream.Materializer
 import io.scalaland.chimney.dsl._
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0._
+import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services.CaseSrv
 import play.api.libs.json._
 import play.api.test.{FakeRequest, PlaySpecification}
@@ -88,9 +89,9 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
         summary = None,
         owner = Some("certuser@thehive.local"),
         customFields = Json.obj(
-          "boolean1" -> Json.obj("boolean" -> true, "order"                   -> JsNull),
-          "string1"  -> Json.obj("string"  -> "string1 custom field", "order" -> JsNull),
-          "date1"    -> Json.obj("date"    -> now.getTime, "order"            -> JsNull)
+          "boolean1" -> Json.obj("boolean" -> true, "order" -> JsNull),
+          "string1"  -> Json.obj("string" -> "string1 custom field", "order" -> JsNull),
+          "date1"    -> Json.obj("date" -> now.getTime, "order" -> JsNull)
         ),
         stats = Json.obj()
       )
@@ -151,13 +152,12 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
       val tasksList = contentAsJson(resultList)(defaultAwaitTimeout, app[Materializer]).as[Seq[OutputTask]]
       tasksList.find(_.title == "task x") must beSome
 
-      val assignee = app[Database].roTransaction(implicit graph => app[CaseSrv].get(outputCase._id).assignee.getOrFail())
+      val assignee = app[Database].roTransaction(implicit graph => app[CaseSrv].get(outputCase._id).assignee.getOrFail("Case"))
 
       assignee must beSuccessfulTry
       assignee.get.login shouldEqual "certuser@thehive.local"
     }
 
-    // FIXME doesn't work with SBT ?!
     "try to get a case" in testApp { app =>
       val request = FakeRequest("GET", s"/api/v0/case/#2")
         .withHeaders("user" -> "certuser@thehive.local")
@@ -232,14 +232,13 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
         .withHeaders("user" -> "certuser@thehive.local")
       val resultGet1 = app[CaseCtrl].get("#1")(requestGet1)
       status(resultGet1) must equalTo(200).updateMessage(s => s"$s\n${contentAsString(resultGet1)}")
-      // Ignore title and flag for case#1 because it can be updated by previous test
-      val case1 = contentAsJson(resultGet1).as[OutputCase].copy(title = resultCases.head.title, flag = resultCases.head.flag)
+      val case1 = contentAsJson(resultGet1).as[OutputCase]
 
-      val requestGet3 = FakeRequest("GET", s"/api/v0/case/#2")
+      val requestGet2 = FakeRequest("GET", s"/api/v0/case/#2")
         .withHeaders("user" -> "certuser@thehive.local")
-      val resultGet3 = app[CaseCtrl].get("#2")(requestGet3)
-      status(resultGet3) must equalTo(200).updateMessage(s => s"$s\n${contentAsString(resultGet3)}")
-      val case3 = contentAsJson(resultGet3).as[OutputCase]
+      val resultGet2 = app[CaseCtrl].get("#2")(requestGet2)
+      status(resultGet2) must equalTo(200).updateMessage(s => s"$s\n${contentAsString(resultGet2)}")
+      val case3 = contentAsJson(resultGet2).as[OutputCase]
 
       resultCases.map(TestCase.apply) must contain(exactly(TestCase(case1), TestCase(case3)))
     }
@@ -259,39 +258,39 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
     }
 
     "search a case by custom field" in testApp { app =>
-      // Create a case with custom fields
-      val now = new Date()
-      val inputCustomFields = Seq(
-        InputCustomFieldValue("date1", Some(now.getTime), None),
-        InputCustomFieldValue("boolean1", Some(true), None)
-      )
-
-      val request = FakeRequest("POST", "/api/v0/case")
-        .withJsonBody(
-          Json
-            .toJson(
-              InputCase(
-                title = "cf case",
-                description = "cf case description",
-                severity = Some(2),
-                startDate = Some(now),
-                tags = Set("tag1cf", "tag2cf"),
-                flag = Some(false),
-                tlp = Some(2),
-                pap = Some(2),
-                customFields = inputCustomFields
-              )
-            )
-            .as[JsObject] + ("template" -> JsString("spam"))
-        )
-        .withHeaders("user" -> "certuser@thehive.local")
-
-      val result = app[CaseCtrl].create(request)
-      status(result) must equalTo(201).updateMessage(s => s"$s\n${contentAsString(result)}")
+//      // Create a case with custom fields
+//      val now = new Date()
+//      val inputCustomFields = Seq(
+//        InputCustomFieldValue("date1", Some(now.getTime), None),
+//        InputCustomFieldValue("boolean1", Some(true), None)
+//      )
+//
+//      val request = FakeRequest("POST", "/api/v0/case")
+//        .withJsonBody(
+//          Json
+//            .toJson(
+//              InputCase(
+//                title = "cf case",
+//                description = "cf case description",
+//                severity = Some(2),
+//                startDate = Some(now),
+//                tags = Set("tag1cf", "tag2cf"),
+//                flag = Some(false),
+//                tlp = Some(2),
+//                pap = Some(2),
+//                customFields = inputCustomFields
+//              )
+//            )
+//            .as[JsObject] + ("template" -> JsString("spam"))
+//        )
+//        .withHeaders("user" -> "certuser@thehive.local")
+//
+//      val result = app[CaseCtrl].create(request)
+//      status(result) must equalTo(201).updateMessage(s => s"$s\n${contentAsString(result)}")
 
       // Search it by cf value
       val requestSearch = FakeRequest("POST", s"/api/v0/case/_search?range=0-15&sort=-flag&sort=-startDate&nstats=true")
-        .withHeaders("user" -> "certuser@thehive.local")
+        .withHeaders("user" -> "socuser@thehive.local")
         .withJsonBody(
           Json.parse("""{"query":{"_and":[{"_field":"customFields.boolean1","_value":true},{"_not":{"status":"Deleted"}}]}}""")
         )
@@ -300,7 +299,6 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
       contentAsJson(resultSearch)(defaultAwaitTimeout, app[Materializer]).as[List[OutputCase]] must not(beEmpty)
     }
 
-    // FIXME doesn't work with SBT ?!
     "get and aggregate properly case stats" in testApp { app =>
       val request = FakeRequest("POST", s"/api/v0/case/_stats")
         .withHeaders("user" -> "certuser@thehive.local")
@@ -332,7 +330,6 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
       (resultCase \ "testNamespace:testPredicate=\"t1\"" \ "count").asOpt[Int] must beSome(2)
       (resultCase \ "testNamespace:testPredicate=\"t2\"" \ "count").asOpt[Int] must beSome(1)
       (resultCase \ "testNamespace:testPredicate=\"t3\"" \ "count").asOpt[Int] must beSome(1)
-      (resultCase \ "count").asOpt[Int] must beSome(2)
     }
 
     "assign a case to an user" in testApp { app =>
@@ -350,7 +347,7 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
     "force delete a case" in testApp { app =>
       val tasks = app[Database].roTransaction { implicit graph =>
         val authContext = DummyUserSrv(organisation = "cert").authContext
-        app[CaseSrv].get("#1").tasks(authContext).toList
+        app[CaseSrv].get("#1").tasks(authContext).toSeq
       }
       tasks must have size 2
 
@@ -360,8 +357,8 @@ class CaseCtrlTest extends PlaySpecification with TestAppBuilder {
       status(resultDel) must equalTo(204).updateMessage(s => s"$s\n${contentAsString(resultDel)}")
 
       app[Database].roTransaction { implicit graph =>
-        app[CaseSrv].get("#1").headOption() must beNone
-//        tasks.flatMap(task => app[TaskSrv].get(task).headOption()) must beEmpty
+        app[CaseSrv].get("#1").headOption must beNone
+//        tasks.flatMap(task => app[TaskSrv].get(task).headOption) must beEmpty
       }
     }
   }
diff --git a/thehive/test/org/thp/thehive/controllers/v0/CaseTemplateCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/CaseTemplateCtrlTest.scala
index 67ef1fb220..deb4d29c5b 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/CaseTemplateCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/CaseTemplateCtrlTest.scala
@@ -1,9 +1,10 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.OutputCaseTemplate
+import org.thp.thehive.services.CaseTemplateOps._
 import org.thp.thehive.services.CaseTemplateSrv
 import play.api.libs.json.Json
 import play.api.test.{FakeRequest, PlaySpecification}
@@ -132,7 +133,7 @@ class CaseTemplateCtrlTest extends PlaySpecification with TestAppBuilder {
       status(result) must equalTo(204).updateMessage(s => s"$s\n${contentAsString(result)}")
 
       val updatedOutput = app[Database].roTransaction { implicit graph =>
-        app[CaseTemplateSrv].get("spam").richCaseTemplate.head()
+        app[CaseTemplateSrv].get("spam").richCaseTemplate.head
       }
 
       updatedOutput.displayName shouldEqual "patched"
diff --git a/thehive/test/org/thp/thehive/controllers/v0/CustomFieldCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/CustomFieldCtrlTest.scala
index 29a2fac8bf..31d532daa1 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/CustomFieldCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/CustomFieldCtrlTest.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.OutputCustomField
 import org.thp.thehive.models._
@@ -154,7 +154,7 @@ class CustomFieldCtrlTest extends PlaySpecification with TestAppBuilder {
     }
 
     "remove a custom field" in testApp { app =>
-      val l = app[Database].roTransaction(graph => app[CustomFieldSrv].initSteps(graph).toList)
+      val l = app[Database].roTransaction(graph => app[CustomFieldSrv].startTraversal(graph).toSeq)
 
       l must not(beEmpty)
 
@@ -166,13 +166,13 @@ class CustomFieldCtrlTest extends PlaySpecification with TestAppBuilder {
 
       status(result) shouldEqual 204
 
-      val newList = app[Database].roTransaction(graph => app[CustomFieldSrv].initSteps(graph).toList)
+      val newList = app[Database].roTransaction(graph => app[CustomFieldSrv].startTraversal(graph).toSeq)
 
       newList.find(_._id == cf._id) must beNone
     }
 
     "update a string custom field" in testApp { app =>
-      val l = app[Database].roTransaction(graph => app[CustomFieldSrv].initSteps(graph).toList)
+      val l = app[Database].roTransaction(graph => app[CustomFieldSrv].startTraversal(graph).toSeq)
 
       l must not(beEmpty)
 
@@ -207,7 +207,7 @@ class CustomFieldCtrlTest extends PlaySpecification with TestAppBuilder {
     }
 
     "update a date custom field" in testApp { app =>
-      val l = app[Database].roTransaction(graph => app[CustomFieldSrv].initSteps(graph).toList)
+      val l = app[Database].roTransaction(graph => app[CustomFieldSrv].startTraversal(graph).toSeq)
 
       l must not(beEmpty)
 
diff --git a/thehive/test/org/thp/thehive/controllers/v0/DashboardCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/DashboardCtrlTest.scala
index e0e25257ed..360db804df 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/DashboardCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/DashboardCtrlTest.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.OutputDashboard
 import org.thp.thehive.services.DashboardSrv
@@ -29,7 +29,7 @@ class DashboardCtrlTest extends PlaySpecification with TestAppBuilder {
 
     "get a dashboard if visible" in testApp { app =>
       val dashboard = app[Database].roTransaction { implicit graph =>
-        app[DashboardSrv].initSteps.has("title", "dashboard cert").getOrFail().get
+        app[DashboardSrv].startTraversal.has("title", "dashboard cert").getOrFail("Dashboard").get
       }
 
       val request = FakeRequest("GET", s"/api/dashboard/${dashboard._id}")
@@ -47,7 +47,7 @@ class DashboardCtrlTest extends PlaySpecification with TestAppBuilder {
 
     "update a dashboard" in testApp { app =>
       val dashboard = app[Database].roTransaction { implicit graph =>
-        app[DashboardSrv].initSteps.has("title", "dashboard cert").getOrFail().get
+        app[DashboardSrv].startTraversal.has("title", "dashboard cert").getOrFail("Dashboard").get
       }
 
       val request = FakeRequest("PATCH", s"/api/dashboard/${dashboard._id}")
@@ -67,7 +67,7 @@ class DashboardCtrlTest extends PlaySpecification with TestAppBuilder {
 
     "delete a dashboard" in testApp { app =>
       val dashboard = app[Database].roTransaction { implicit graph =>
-        app[DashboardSrv].initSteps.has("title", "dashboard cert").getOrFail().get
+        app[DashboardSrv].startTraversal.has("title", "dashboard cert").getOrFail("Dashboard").get
       }
 
       val request = FakeRequest("DELETE", s"/api/dashboard/${dashboard._id}")
@@ -77,7 +77,7 @@ class DashboardCtrlTest extends PlaySpecification with TestAppBuilder {
       status(result) must equalTo(204).updateMessage(s => s"$s\n${contentAsString(result)}")
 
       app[Database].roTransaction { implicit graph =>
-        app[DashboardSrv].initSteps.has("title", "dashboard cert").exists() must beFalse
+        app[DashboardSrv].startTraversal.has("title", "dashboard cert").exists must beFalse
       }
     }
   }
diff --git a/thehive/test/org/thp/thehive/controllers/v0/LogCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/LogCtrlTest.scala
index b7ad9c6e04..24d2fe9dea 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/LogCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/LogCtrlTest.scala
@@ -1,8 +1,9 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services.{LogSrv, TaskSrv}
 import play.api.libs.json.Json
 import play.api.test.{FakeRequest, PlaySpecification}
@@ -13,7 +14,7 @@ class LogCtrlTest extends PlaySpecification with TestAppBuilder {
 
     "be able to create a log" in testApp { app =>
       val task = app[Database].roTransaction { implicit graph =>
-        app[TaskSrv].initSteps.has("title", "case 1 task 1").headOption().get
+        app[TaskSrv].startTraversal.has("title", "case 1 task 1").headOption.get
       }
 
       val request = FakeRequest("POST", s"/api/case/task/${task._id}/log")
@@ -26,13 +27,13 @@ class LogCtrlTest extends PlaySpecification with TestAppBuilder {
       status(result) shouldEqual 201
 
       app[Database].roTransaction { implicit graph =>
-        app[TaskSrv].get(task).logs.has("message", "log 1\n\n### yeahyeahyeahs").exists()
+        app[TaskSrv].get(task).logs.has("message", "log 1\n\n### yeahyeahyeahs").exists
       } must beTrue
     }
 
     "be able to create and remove a log" in testApp { app =>
       val log = app[Database].roTransaction { implicit graph =>
-        app[LogSrv].initSteps.has("message", "log for action test").getOrFail("Log").get
+        app[LogSrv].startTraversal.has("message", "log for action test").getOrFail("Log").get
       }
 
       val requestDelete = FakeRequest("DELETE", s"/api/case/task/log/${log._id}").withHeaders("user" -> "certuser@thehive.local")
@@ -41,7 +42,7 @@ class LogCtrlTest extends PlaySpecification with TestAppBuilder {
       status(resultDelete) shouldEqual 204
 
       val deletedLog = app[Database].roTransaction { implicit graph =>
-        app[LogSrv].initSteps.has("message", "log for action test").headOption()
+        app[LogSrv].startTraversal.has("message", "log for action test").headOption
       }
       deletedLog should beNone
     }
diff --git a/thehive/test/org/thp/thehive/controllers/v0/ObservableCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/ObservableCtrlTest.scala
index b6af4e4902..da4928d437 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/ObservableCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/ObservableCtrlTest.scala
@@ -8,11 +8,12 @@ import akka.stream.Materializer
 import io.scalaland.chimney.dsl._
 import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Hasher
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.{OutputAttachment, OutputCase, OutputObservable}
 import org.thp.thehive.models._
+import org.thp.thehive.services.DataOps._
 import org.thp.thehive.services.DataSrv
 import play.api.Configuration
 import play.api.libs.Files
@@ -282,7 +283,7 @@ class ObservableCtrlTest extends PlaySpecification with TestAppBuilder {
     val dataSrv: DataSrv = app.apply[DataSrv]
     val db: Database     = app.apply[Database]
     db.roTransaction { implicit graph =>
-      dataSrv.initSteps.getByData(data).toList
+      dataSrv.startTraversal.getByData(data).toList
     }
   }
 }
diff --git a/thehive/test/org/thp/thehive/controllers/v0/OrganisationCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/OrganisationCtrlTest.scala
index 2ae5bfcb12..579028de13 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/OrganisationCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/OrganisationCtrlTest.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.{InputOrganisation, OutputOrganisation}
 import org.thp.thehive.services.OrganisationSrv
@@ -121,7 +121,7 @@ class OrganisationCtrlTest extends PlaySpecification with TestAppBuilder {
       val result = app[OrganisationCtrl].update("cert")(request)
       status(result) must beEqualTo(204).updateMessage(s => s"$s\n${contentAsString(result)}")
       app[Database].roTransaction { implicit graph =>
-        app[OrganisationSrv].get("cert2").exists() must beTrue
+        app[OrganisationSrv].get("cert2").exists must beTrue
       }
     }
 
diff --git a/thehive/test/org/thp/thehive/controllers/v0/PageCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/PageCtrlTest.scala
index ce8d638f69..902e495484 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/PageCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/PageCtrlTest.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.OutputPage
 import org.thp.thehive.services.PageSrv
@@ -69,7 +69,7 @@ class PageCtrlTest extends PlaySpecification with TestAppBuilder {
       status(result) must equalTo(204).updateMessage(s => s"$s\n${contentAsString(result)}")
 
       app[Database].roTransaction { implicit graph =>
-        app[PageSrv].get("how_to_create_a_case").exists()
+        app[PageSrv].get("how_to_create_a_case").exists
       } must beFalse
     }
   }
diff --git a/thehive/test/org/thp/thehive/controllers/v0/ProfileCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/ProfileCtrlTest.scala
index ac673e75d9..c01c0941dd 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/ProfileCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/ProfileCtrlTest.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.OutputProfile
 import org.thp.thehive.models.Profile
@@ -58,7 +58,7 @@ class ProfileCtrlTest extends PlaySpecification with TestAppBuilder {
       val result = app[ProfileCtrl].delete("testProfile")(request)
       status(result) must equalTo(204).updateMessage(s => s"$s\n${contentAsString(result)}")
       app[Database].roTransaction { implicit graph =>
-        app[ProfileSrv].get("testProfile").exists() must beFalse
+        app[ProfileSrv].get("testProfile").exists must beFalse
       }
     }
 
diff --git a/thehive/test/org/thp/thehive/controllers/v0/QueryTest.scala b/thehive/test/org/thp/thehive/controllers/v0/QueryTest.scala
index b65586b2ab..5f01dd9117 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/QueryTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/QueryTest.scala
@@ -4,18 +4,7 @@ import org.specs2.mock.Mockito
 import org.thp.scalligraph.controllers.{Entrypoint, Field}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query.{ParamQuery, PublicProperty, QueryExecutor}
-import org.thp.thehive.services.{
-  AlertSrv,
-  CaseSrv,
-  CaseTemplateSrv,
-  CustomFieldSrv,
-  DashboardSrv,
-  ObservableSrv,
-  OrganisationSrv,
-  ShareSrv,
-  TaskSrv,
-  UserSrv
-}
+import org.thp.thehive.services._
 import play.api.libs.json.Json
 import play.api.test.PlaySpecification
 
@@ -29,7 +18,8 @@ class QueryTest extends PlaySpecification with Mockito {
     mock[ObservableSrv],
     mock[CaseTemplateSrv],
     mock[TaskSrv],
-    mock[CustomFieldSrv]
+    mock[CustomFieldSrv],
+    mock[Database]
   )
 
   val taskCtrl = new TaskCtrl(
diff --git a/thehive/test/org/thp/thehive/controllers/v0/ShareCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/ShareCtrlTest.scala
index 59d19e2f07..0f8b75e3ae 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/ShareCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/ShareCtrlTest.scala
@@ -1,10 +1,11 @@
 package org.thp.thehive.controllers.v0
 
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0._
 import org.thp.thehive.models.Profile
+import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services.CaseSrv
 import play.api.libs.json.Json
 import play.api.test.{FakeRequest, PlaySpecification}
@@ -19,7 +20,7 @@ class ShareCtrlTest extends PlaySpecification with TestAppBuilder {
     status(result) must equalTo(200).updateMessage(s => s"$s\n${contentAsString(result)}")
 
     app[Database].roTransaction { implicit graph =>
-      app[CaseSrv].get("#1").visible(DummyUserSrv(organisation = "soc").authContext).exists()
+      app[CaseSrv].get("#1").visible(DummyUserSrv(organisation = "soc").authContext).exists
     } must beTrue
   }
 
@@ -41,7 +42,7 @@ class ShareCtrlTest extends PlaySpecification with TestAppBuilder {
     status(result) must equalTo(204).updateMessage(s => s"$s\n${contentAsString(result)}")
 
     app[Database].roTransaction { implicit graph =>
-      app[CaseSrv].get("#2").visible(DummyUserSrv(userId = "socro@thehive.local").authContext).exists()
+      app[CaseSrv].get("#2").visible(DummyUserSrv(userId = "socro@thehive.local").authContext).exists
     } must beFalse
   }
 
diff --git a/thehive/test/org/thp/thehive/controllers/v0/TagCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/TagCtrlTest.scala
index 9ba7aa53a4..3874cdfbde 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/TagCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/TagCtrlTest.scala
@@ -5,7 +5,7 @@ import java.nio.file.{Path, Files => JFiles}
 
 import akka.stream.Materializer
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.OutputTag
 import org.thp.thehive.services.TagSrv
@@ -121,7 +121,7 @@ class TagCtrlTest extends PlaySpecification with TestAppBuilder {
 
     "get a tag" in testApp { app =>
       // Get a tag id first
-      val tags = app[Database].roTransaction(implicit graph => app[TagSrv].initSteps.toList)
+      val tags = app[Database].roTransaction(implicit graph => app[TagSrv].startTraversal.toSeq)
       val tag  = tags.head
 
       val request = FakeRequest("GET", s"/api/tag/${tag._id}")
diff --git a/thehive/test/org/thp/thehive/controllers/v0/TaskCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/TaskCtrlTest.scala
index c591ebb6ef..6b640e2d22 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/TaskCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/TaskCtrlTest.scala
@@ -4,11 +4,12 @@ import java.util.Date
 
 import io.scalaland.chimney.dsl._
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.OutputTask
 import org.thp.thehive.models._
+import org.thp.thehive.services.TaskOps._
 import org.thp.thehive.services.{CaseSrv, TaskSrv}
 import play.api.libs.json.Json
 import play.api.test.{FakeRequest, PlaySpecification}
@@ -37,7 +38,7 @@ class TaskCtrlTest extends PlaySpecification with TestAppBuilder {
   "task controller" should {
     "list available tasks and get one task" in testApp { app =>
       val taskId = app[Database].roTransaction { implicit graph =>
-        app[TaskSrv].initSteps.has("title", "case 1 task 1")._id.getOrFail("Task").get
+        app[TaskSrv].startTraversal.has("title", "case 1 task 1")._id.getOrFail("Task").get
       }
       val request    = FakeRequest("GET", s"/api/case/task/$taskId").withHeaders("user" -> "certuser@thehive.local")
       val result     = app[TaskCtrl].get(taskId)(request)
@@ -61,7 +62,7 @@ class TaskCtrlTest extends PlaySpecification with TestAppBuilder {
 
     "patch a task" in testApp { app =>
       val taskId = app[Database].roTransaction { implicit graph =>
-        app[TaskSrv].initSteps.has("title", "case 1 task 1")._id.getOrFail("Task").get
+        app[TaskSrv].startTraversal.has("title", "case 1 task 1")._id.getOrFail("Task").get
       }
       val request = FakeRequest("PATCH", s"/api/case/task/$taskId")
         .withHeaders("user" -> "certuser@thehive.local")
@@ -83,7 +84,7 @@ class TaskCtrlTest extends PlaySpecification with TestAppBuilder {
 
       val newTask = app[Database]
         .roTransaction { implicit graph =>
-          app[TaskSrv].initSteps.has("title", "new title task 1").richTask.getOrFail("Task")
+          app[TaskSrv].startTraversal.has("title", "new title task 1").richTask.getOrFail("Task")
         }
         .map(TestTask.apply)
         .map(_.copy(startDate = None))
@@ -113,7 +114,7 @@ class TaskCtrlTest extends PlaySpecification with TestAppBuilder {
       val expected = TestTask(
         title = "case 1 task",
         description = Some("description task 1"),
-        owner = None, // FIXME
+        owner = None,
         startDate = None,
         flag = true,
         status = "Waiting",
@@ -132,7 +133,7 @@ class TaskCtrlTest extends PlaySpecification with TestAppBuilder {
 
     "unset task owner" in testApp { app =>
       val taskId = app[Database].roTransaction { implicit graph =>
-        app[TaskSrv].initSteps.has("title", "case 1 task 1")._id.getOrFail("Task").get
+        app[TaskSrv].startTraversal.has("title", "case 1 task 1")._id.getOrFail("Task").get
       }
       val request = FakeRequest("PATCH", s"/api/case/task/$taskId")
         .withHeaders("user" -> "certuser@thehive.local")
@@ -143,7 +144,7 @@ class TaskCtrlTest extends PlaySpecification with TestAppBuilder {
 
       val newTask = app[Database]
         .roTransaction { implicit graph =>
-          app[TaskSrv].initSteps.has("title", "case 1 task 1").richTask.getOrFail("Task")
+          app[TaskSrv].startTraversal.has("title", "case 1 task 1").richTask.getOrFail("Task")
         }
         .map(TestTask.apply)
 
@@ -163,7 +164,7 @@ class TaskCtrlTest extends PlaySpecification with TestAppBuilder {
     }
 
     "get tasks stats" in testApp { app =>
-      val case1 = app[Database].roTransaction(graph => app[CaseSrv].initSteps(graph).has("title", "case#1").getOrFail("Case"))
+      val case1 = app[Database].roTransaction(graph => app[CaseSrv].startTraversal(graph).has("title", "case#1").getOrFail("Case"))
 
       case1 must beSuccessfulTry
 
diff --git a/thehive/test/org/thp/thehive/controllers/v0/UserCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v0/UserCtrlTest.scala
index a08d9a73be..104d0e44c6 100644
--- a/thehive/test/org/thp/thehive/controllers/v0/UserCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v0/UserCtrlTest.scala
@@ -3,7 +3,7 @@ package org.thp.thehive.controllers.v0
 import akka.stream.Materializer
 import org.thp.scalligraph.AuthenticationError
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v0.OutputUser
 import org.thp.thehive.services.UserSrv
@@ -144,7 +144,7 @@ class UserCtrlTest extends PlaySpecification with TestAppBuilder {
       status(result) must beEqualTo(204)
 
       app[Database].roTransaction { implicit graph =>
-        app[UserSrv].get("certro@thehive.local").exists()
+        app[UserSrv].get("certro@thehive.local").exists
       } must beFalse
     }
   }
diff --git a/thehive/test/org/thp/thehive/controllers/v1/AlertCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v1/AlertCtrlTest.scala
index 5e5060bc08..f1c1217d82 100644
--- a/thehive/test/org/thp/thehive/controllers/v1/AlertCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v1/AlertCtrlTest.scala
@@ -3,7 +3,7 @@ package org.thp.thehive.controllers.v1
 import java.util.Date
 
 import org.thp.scalligraph.models.{Database, Entity}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v1.{InputAlert, OutputAlert}
 import org.thp.thehive.models._
@@ -136,7 +136,7 @@ class AlertCtrlTest extends PlaySpecification with TestAppBuilder {
     "get an alert" in testApp { app =>
       val alertSrv = app.apply[AlertSrv]
       app.apply[Database].roTransaction { implicit graph =>
-        alertSrv.initSteps.has("sourceRef", "ref1").getOrFail()
+        alertSrv.startTraversal.has("sourceRef", "ref1").getOrFail("Alert")
       } must beSuccessfulTry.which { alert: Alert with Entity =>
         val request = FakeRequest("GET", s"/api/v1/alert/${alert._id}").withHeaders("user" -> "socuser@thehive.local")
         val result  = app[AlertCtrl].get(alert._id)(request)
diff --git a/thehive/test/org/thp/thehive/controllers/v1/OrganisationCtrlTest.scala b/thehive/test/org/thp/thehive/controllers/v1/OrganisationCtrlTest.scala
index 2f34e58ea5..3e7b31df63 100644
--- a/thehive/test/org/thp/thehive/controllers/v1/OrganisationCtrlTest.scala
+++ b/thehive/test/org/thp/thehive/controllers/v1/OrganisationCtrlTest.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.controllers.v1
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.dto.v1.{InputOrganisation, OutputOrganisation}
 import org.thp.thehive.models.Organisation
@@ -58,7 +58,7 @@ class OrganisationCtrlTest extends PlaySpecification with TestAppBuilder {
       val result = app[OrganisationCtrl].update("cert")(request)
       status(result) must_=== 204
       app[Database].roTransaction { implicit graph =>
-        app[OrganisationSrv].get("cert2").exists() must beTrue
+        app[OrganisationSrv].get("cert2").exists must beTrue
       }
     }
 
diff --git a/thehive/test/org/thp/thehive/services/AlertSrvTest.scala b/thehive/test/org/thp/thehive/services/AlertSrvTest.scala
index 99e5828c2f..d1703f8bc7 100644
--- a/thehive/test/org/thp/thehive/services/AlertSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/AlertSrvTest.scala
@@ -5,9 +5,13 @@ import java.util.Date
 import org.thp.scalligraph.CreateError
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
+import org.thp.thehive.services.AlertOps._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
+import org.thp.thehive.services.OrganisationOps._
 import play.api.libs.json.JsString
 import play.api.test.PlaySpecification
 
@@ -53,9 +57,9 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
       app[Database].roTransaction { implicit graph =>
         app[OrganisationSrv].get("cert").alerts.toList must contain(a.get.alert)
 
-        val tags = app[TagSrv].initSteps.toList.filter(t => t.predicate == "tag1" || t.predicate == "tag2")
+        val tags = app[TagSrv].startTraversal.toSeq.filter(t => t.predicate == "tag1" || t.predicate == "tag2")
 
-        app[AlertSrv].get(a.get.alert).tags.toList must containTheSameElementsAs(tags)
+        app[AlertSrv].get(a.get.alert).tags.toSeq must containTheSameElementsAs(tags)
       }
     }
 
@@ -66,7 +70,7 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
           tag3  <- app[TagSrv].getOrCreate("tag3")
           tag5  <- app[TagSrv].getOrCreate("tag5")
           _     <- app[AlertSrv].updateTags(alert, Set(tag3, tag5))
-        } yield app[AlertSrv].get("testType;testSource;ref1").tags.toList
+        } yield app[AlertSrv].get("testType;testSource;ref1").tags.toSeq
       }
       newTags must beSuccessfulTry.which(t => t.map(_.toString) must contain(exactly("tag3", "tag5")))
     }
@@ -76,7 +80,7 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
         for {
           alert <- app[AlertSrv].getOrFail("testType;testSource;ref1")
           _     <- app[AlertSrv].updateTagNames(alert, Set("tag3", "tag5"))
-        } yield app[AlertSrv].get("testType;testSource;ref1").tags.toList
+        } yield app[AlertSrv].get("testType;testSource;ref1").tags.toSeq
       }
       tags must beSuccessfulTry.which(t => t.map(_.toString) must contain(exactly("tag3", "tag5")))
     }
@@ -86,7 +90,7 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
         for {
           alert <- app[AlertSrv].getOrFail("testType;testSource;ref1")
           _     <- app[AlertSrv].addTags(alert, Set("tag7"))
-        } yield app[AlertSrv].get("testType;testSource;ref1").tags.toList
+        } yield app[AlertSrv].get("testType;testSource;ref1").tags.toSeq
       }
 
       tags must beSuccessfulTry.which(t =>
@@ -123,7 +127,7 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
       } must beASuccessfulTry
 
       app[Database].roTransaction { implicit graph =>
-        app[AlertSrv].get("testType;testSource;ref1").observables.filterOnData("perdu.com").filterOnType("domain").exists()
+        app[AlertSrv].get("testType;testSource;ref1").observables.filterOnData("perdu.com").filterOnType("domain").exists
       } must beTrue
     }
 
@@ -137,7 +141,7 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
       } must beSuccessfulTry
 
       app[Database].roTransaction { implicit graph =>
-        app[AlertSrv].get("testType;testSource;ref1").customFields("string1").nameJsonValue.headOption()
+        app[AlertSrv].get("testType;testSource;ref1").customFields("string1").nameJsonValue.headOption
       } must beSome("string1" -> JsString("sad"))
     }
 
@@ -180,11 +184,11 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
     "create a case" in testApp { app =>
       app[Database].tryTransaction { implicit graph =>
         for {
-          alert        <- app[AlertSrv].get("testType;testSource;ref1").richAlert.getOrFail()
+          alert        <- app[AlertSrv].get("testType;testSource;ref1").richAlert.getOrFail("Alert")
           organisation <- app[OrganisationSrv].getOrFail("cert")
           c            <- app[AlertSrv].createCase(alert, None, organisation)
           _ = c.title must beEqualTo("[SPAM] alert#1")
-          _ <- app[CaseSrv].initSteps.has("title", "[SPAM] alert#1").getOrFail()
+          _ <- app[CaseSrv].startTraversal.has("title", "[SPAM] alert#1").getOrFail("Alert")
         } yield ()
       } must beASuccessfulTry(())
     }
@@ -196,7 +200,7 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
         } must beASuccessfulTry
 
       app[Database].roTransaction { implicit graph =>
-        app[CaseSrv].get("#1").richCase.getOrFail().get
+        app[CaseSrv].get("#1").richCase.getOrFail("Case").get
         pending("must check tags, description and observables")
       }
     }
@@ -209,8 +213,8 @@ class AlertSrvTest extends PlaySpecification with TestAppBuilder {
         } yield ()
       } must beSuccessfulTry
       app[Database].roTransaction { implicit graph =>
-//        app[ObservableSrv].initSteps.filterOnType("domain").filterOnData("perdu.com").exists() must beFalse
-        app[AlertSrv].initSteps.get("testType;testSource;ref4").exists() must beFalse
+//        app[ObservableSrv].initSteps.filterOnType("domain").filterOnData("perdu.com").exists must beFalse
+        app[AlertSrv].startTraversal.get("testType;testSource;ref4").exists must beFalse
       }
     }
   }
diff --git a/thehive/test/org/thp/thehive/services/AttachmentSrvTest.scala b/thehive/test/org/thp/thehive/services/AttachmentSrvTest.scala
index cf20435d50..15cc6cf4c4 100644
--- a/thehive/test/org/thp/thehive/services/AttachmentSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/AttachmentSrvTest.scala
@@ -7,7 +7,7 @@ import java.util.UUID
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import play.api.libs.Files
 import play.api.libs.Files.TemporaryFileCreator
@@ -55,11 +55,11 @@ class AttachmentSrvTest extends PlaySpecification with TestAppBuilder {
     }
 
     "get an attachment" in testApp { app =>
-      val allAttachments = app[Database].roTransaction(implicit graph => app[AttachmentSrv].initSteps.toList)
+      val allAttachments = app[Database].roTransaction(implicit graph => app[AttachmentSrv].startTraversal.toSeq)
       allAttachments must not(beEmpty)
 
       app[Database].roTransaction { implicit graph =>
-        app[AttachmentSrv].get(allAttachments.head.attachmentId).exists() must beTrue
+        app[AttachmentSrv].get(allAttachments.head.attachmentId).exists must beTrue
       }
     }
   }
diff --git a/thehive/test/org/thp/thehive/services/AuditSrvTest.scala b/thehive/test/org/thp/thehive/services/AuditSrvTest.scala
index 1403f3413b..65c47fb0a1 100644
--- a/thehive/test/org/thp/thehive/services/AuditSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/AuditSrvTest.scala
@@ -5,7 +5,7 @@ import java.util.Date
 import org.apache.tinkerpop.gremlin.process.traversal.Order
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
 import play.api.test.PlaySpecification
@@ -36,9 +36,9 @@ class AuditSrvTest extends PlaySpecification with TestAppBuilder {
           val t = app[TaskSrv].create(Task("test audit", "", None, TaskStatus.Waiting, flag = false, None, None, 0, None), None)
           app[ShareSrv].shareTask(t.get, c1.`case`, orgAdmin)
         }
-        val audits = app[AuditSrv].initSteps.toList
+        val audits = app[AuditSrv].startTraversal.toSeq
 
-        val r = app[AuditSrv].getMainByIds(Order.asc, audits.map(_._id): _*).toList
+        val r = app[AuditSrv].getMainByIds(Order.asc, audits.map(_._id): _*).toSeq
 
         // Only the main ones
         r.head shouldEqual audits.filter(_.mainAction).minBy(_._createdAt)
@@ -54,8 +54,8 @@ class AuditSrvTest extends PlaySpecification with TestAppBuilder {
         app[AuditSrv].mergeAudits(app[TaskSrv].update(app[TaskSrv].get(auditedTask._id), Nil)) {
           case (taskSteps, updatedFields) =>
             taskSteps
-              .newInstance()
-              .getOrFail()
+              .clone()
+              .getOrFail("Task")
               .flatMap(app[AuditSrv].task.update(_, updatedFields))
         }
       } must beSuccessfulTry
diff --git a/thehive/test/org/thp/thehive/services/CaseSrvTest.scala b/thehive/test/org/thp/thehive/services/CaseSrvTest.scala
index 2ac6eb35a2..cccad04499 100644
--- a/thehive/test/org/thp/thehive/services/CaseSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/CaseSrvTest.scala
@@ -8,9 +8,11 @@ import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.FPathElem
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.query.PropertyUpdater
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseOps._
+import org.thp.thehive.services.ObservableOps._
 import play.api.libs.json.Json
 import play.api.test.PlaySpecification
 
@@ -23,13 +25,13 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
 
     "list all cases" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
-        app[CaseSrv].initSteps.toList.map(_.number) must contain(allOf(1, 2, 3))
+        app[CaseSrv].startTraversal.toSeq.map(_.number) must contain(allOf(1, 2, 3))
       }
     }
 
     "get a case without impact status" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
-        val richCase = app[CaseSrv].get("#1").richCase.head()
+        val richCase = app[CaseSrv].get("#1").richCase.head
         richCase must_== RichCase(
           richCase._id,
           authContext.userId,
@@ -67,10 +69,9 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
       }
     }
 
-    // FIXME doesn't work with SBT ?!
     "get a case with impact status" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
-        val richCase = app[CaseSrv].get("#2").richCase.head()
+        val richCase = app[CaseSrv].get("#2").richCase.head
         richCase must_== RichCase(
           richCase._id,
           authContext.userId,
@@ -111,7 +112,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
 
     "get a case with custom fields" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
-        val richCase = app[CaseSrv].get("#3").richCase(DummyUserSrv(userId = "socuser@thehive.local", organisation = "soc").authContext).head()
+        val richCase = app[CaseSrv].get("#3").richCase(DummyUserSrv(userId = "socuser@thehive.local", organisation = "soc").authContext).head
         richCase.number must_=== 3
         richCase.title must_=== "case#3"
         richCase.description must_=== "description of case #3"
@@ -194,7 +195,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
 
     "update case title" in testApp { app =>
       app[Database].transaction { implicit graph =>
-        app[CaseSrv].get("#3").update("title" -> "new title")
+        app[CaseSrv].get("#3").update(_.title, "new title").getOrFail("Case")
         app[CaseSrv].getOrFail("#3") must beSuccessfulTry.which { `case`: Case with Entity =>
           `case`.title must_=== "new title"
         }
@@ -217,7 +218,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
 
       r must beSuccessfulTry
 
-      val updatedCase = app[Database].roTransaction(implicit graph => app[CaseSrv].get("#1").getOrFail().get)
+      val updatedCase = app[Database].roTransaction(implicit graph => app[CaseSrv].get("#1").getOrFail("Case").get)
       updatedCase.status shouldEqual CaseStatus.Resolved
       updatedCase.endDate must beSome
     }
@@ -225,7 +226,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
     "upsert case tags" in testApp { app =>
       app[Database].tryTransaction { implicit graph =>
         for {
-          c3 <- app[CaseSrv].get("#3").getOrFail()
+          c3 <- app[CaseSrv].get("#3").getOrFail("Case")
           _  <- app[CaseSrv].updateTagNames(c3, Set("""testNamespace:testPredicate="t2"""", """testNamespace:testPredicate="yolo""""))
         } yield app[CaseSrv].get(c3).tags.toList.map(_.toString)
       } must beASuccessfulTry.which { tags =>
@@ -241,7 +242,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
             Case(0, "case 5", "desc 5", 1, new Date(), None, flag = false, 2, 3, CaseStatus.Open, None),
             None,
             app[OrganisationSrv].getOrFail("cert").get,
-            app[TagSrv].initSteps.toList.toSet,
+            app[TagSrv].startTraversal.toSeq.toSet,
             Seq.empty,
             None,
             Nil
@@ -258,14 +259,14 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
       ) must beSuccessfulTry
 
       app[Database].roTransaction { implicit graph =>
-        app[CaseSrv].initSteps.has("title", "case 5").tags.toList.length shouldEqual currentLen + 1
+        app[CaseSrv].startTraversal.has("title", "case 5").tags.toList.length shouldEqual currentLen + 1
       }
     }
 
     "add an observable if not existing" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
-        val c1          = app[CaseSrv].get("#1").getOrFail().get
-        val observables = app[ObservableSrv].initSteps.richObservable.toList
+        val c1          = app[CaseSrv].get("#1").getOrFail("Case").get
+        val observables = app[ObservableSrv].startTraversal.richObservable.toList
 
         observables must not(beEmpty)
 
@@ -278,7 +279,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
         val newObs = app[Database].tryTransaction { implicit graph =>
           app[ObservableSrv].create(
             Observable(Some("if you feel lost"), 1, ioc = false, sighted = true),
-            app[ObservableTypeSrv].get("domain").getOrFail().get,
+            app[ObservableTypeSrv].get("domain").getOrFail("Case").get,
             "lost.com",
             Set[String](),
             Nil
@@ -308,7 +309,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
 
       app[Database].tryTransaction(implicit graph => app[CaseSrv].remove(c1.`case`)) must beSuccessfulTry
       app[Database].roTransaction { implicit graph =>
-        app[CaseSrv].get(c1._id).exists() must beFalse
+        app[CaseSrv].get(c1._id).exists must beFalse
       }
     }
 
@@ -320,17 +321,17 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
               Case(0, "case 6", "desc 6", 1, new Date(), None, flag = false, 2, 3, CaseStatus.Open, None),
               None,
               app[OrganisationSrv].getOrFail("cert").get,
-              app[TagSrv].initSteps.toList.toSet,
+              app[TagSrv].startTraversal.toSeq.toSet,
               Seq.empty,
               None,
               Nil
             )
 
-            _ = app[CaseSrv].get(case0._id).impactStatus.exists() must beFalse
+            _ = app[CaseSrv].get(case0._id).impactStatus.exists must beFalse
             _ <- app[CaseSrv].setImpactStatus(case0.`case`, "WithImpact")
-            _ <- app[CaseSrv].get(case0._id).impactStatus.getOrFail()
+            _ <- app[CaseSrv].get(case0._id).impactStatus.getOrFail("Case")
             _ <- app[CaseSrv].unsetImpactStatus(case0.`case`)
-            _ = app[CaseSrv].get(case0._id).impactStatus.exists() must beFalse
+            _ = app[CaseSrv].get(case0._id).impactStatus.exists must beFalse
           } yield ()
         } must beASuccessfulTry
     }
@@ -343,7 +344,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
               Case(0, "case 7", "desc 7", 1, new Date(), None, flag = false, 2, 3, CaseStatus.Open, None),
               None,
               app[OrganisationSrv].getOrFail("cert").get,
-              app[TagSrv].initSteps.toList.toSet,
+              app[TagSrv].startTraversal.toSeq.toSet,
               Seq.empty,
               None,
               Nil
@@ -351,11 +352,11 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
           )
           .get
 
-        app[CaseSrv].get(c7._id).resolutionStatus.exists() must beFalse
+        app[CaseSrv].get(c7._id).resolutionStatus.exists must beFalse
         app[Database].tryTransaction(implicit graph => app[CaseSrv].setResolutionStatus(c7.`case`, "Duplicated")) must beSuccessfulTry
-        app[Database].roTransaction(implicit graph => app[CaseSrv].get(c7._id).resolutionStatus.exists() must beTrue)
+        app[Database].roTransaction(implicit graph => app[CaseSrv].get(c7._id).resolutionStatus.exists must beTrue)
         app[Database].tryTransaction(implicit graph => app[CaseSrv].unsetResolutionStatus(c7.`case`)) must beSuccessfulTry
-        app[Database].roTransaction(implicit graph => app[CaseSrv].get(c7._id).resolutionStatus.exists() must beFalse)
+        app[Database].roTransaction(implicit graph => app[CaseSrv].get(c7._id).resolutionStatus.exists must beFalse)
       }
     }
 
@@ -364,9 +365,9 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
         .tryTransaction(implicit graph =>
           app[CaseSrv].create(
             Case(0, "case 8", "desc 8", 2, new Date(), None, flag = false, 2, 3, CaseStatus.Open, None),
-            Some(app[UserSrv].get("certuser@thehive.local").getOrFail().get),
+            Some(app[UserSrv].get("certuser@thehive.local").getOrFail("Case").get),
             app[OrganisationSrv].getOrFail("cert").get,
-            app[TagSrv].initSteps.toList.toSet,
+            app[TagSrv].startTraversal.toSeq.toSet,
             Seq.empty,
             None,
             Nil
@@ -376,18 +377,20 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
         .`case`
 
       def checkAssignee(status: Matcher[Boolean]) =
-        app[Database].roTransaction(implicit graph => app[CaseSrv].get(c8).assignee.exists() must status)
+        app[Database].roTransaction(implicit graph => app[CaseSrv].get(c8).assignee.exists must status)
 
       checkAssignee(beTrue)
       app[Database].tryTransaction(implicit graph => app[CaseSrv].unassign(c8)) must beSuccessfulTry
       checkAssignee(beFalse)
-      app[Database].tryTransaction(implicit graph => app[CaseSrv].assign(c8, app[UserSrv].get("certuser@thehive.local").getOrFail().get)) must beSuccessfulTry
+      app[Database].tryTransaction(implicit graph =>
+        app[CaseSrv].assign(c8, app[UserSrv].get("certuser@thehive.local").getOrFail("Case").get)
+      ) must beSuccessfulTry
       checkAssignee(beTrue)
     }
 
     "show only visible cases" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
-        app[CaseSrv].get("#3").visible.getOrFail() must beFailedTry
+        app[CaseSrv].get("#3").visible.getOrFail("Case") must beFailedTry
       }
     }
 
@@ -396,18 +399,18 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
         app[CaseSrv]
           .get("#1")
           .can(Permissions.manageCase)(DummyUserSrv(userId = "certro@thehive.local", organisation = "cert").authContext)
-          .exists() must beFalse
+          .exists must beFalse
       }
     }
 
     "show linked cases" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
         app[CaseSrv].get("#1").linkedCases must beEmpty
-        val observables = app[ObservableSrv].initSteps.richObservable.toList
+        val observables = app[ObservableSrv].startTraversal.richObservable.toList
         val hfr         = observables.find(_.message.contains("Some weird domain")).get
 
         app[Database].tryTransaction { implicit graph =>
-          app[CaseSrv].addObservable(app[CaseSrv].get("#2").getOrFail().get, hfr)
+          app[CaseSrv].addObservable(app[CaseSrv].get("#2").getOrFail("Case").get, hfr)
         }
 
         app[Database].roTransaction(implicit graph => app[CaseSrv].get("#1").linkedCases must not(beEmpty))
diff --git a/thehive/test/org/thp/thehive/services/CaseTemplateSrvTest.scala b/thehive/test/org/thp/thehive/services/CaseTemplateSrvTest.scala
index cd3ac8eee1..ac6e13058e 100644
--- a/thehive/test/org/thp/thehive/services/CaseTemplateSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/CaseTemplateSrvTest.scala
@@ -2,9 +2,11 @@ package org.thp.thehive.services
 
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
+import org.thp.thehive.services.CaseTemplateOps._
+import org.thp.thehive.services.TagOps._
 import play.api.libs.json.{JsNumber, JsString, JsTrue, JsValue}
 import play.api.test.PlaySpecification
 
@@ -31,7 +33,7 @@ class CaseTemplateSrvTest extends PlaySpecification with TestAppBuilder {
           tasks = Seq(
             (
               Task("task case template case template test 1", "group1", None, TaskStatus.Waiting, flag = false, None, None, 0, None),
-              app[UserSrv].get("certuser@thehive.local").headOption()
+              app[UserSrv].get("certuser@thehive.local").headOption
             )
           ),
           customFields = Seq(("string1", Some("love")), ("boolean1", Some(false)))
@@ -39,9 +41,9 @@ class CaseTemplateSrvTest extends PlaySpecification with TestAppBuilder {
       } must beASuccessfulTry
 
       app[Database].roTransaction { implicit graph =>
-        app[TagSrv].initSteps.getByName("testNamespace", "testPredicate", Some("newOne")).exists() must beTrue
-        app[TaskSrv].initSteps.has("title", "task case template case template test 1").exists() must beTrue
-        val richCT = app[CaseTemplateSrv].initSteps.has("name", "case template test 1").richCaseTemplate.getOrFail().get
+        app[TagSrv].startTraversal.getByName("testNamespace", "testPredicate", Some("newOne")).exists must beTrue
+        app[TaskSrv].startTraversal.has("title", "task case template case template test 1").exists must beTrue
+        val richCT = app[CaseTemplateSrv].startTraversal.has("name", "case template test 1").richCaseTemplate.getOrFail("CaseTemplate").get
         richCT.customFields.length shouldEqual 2
       }
     }
@@ -56,7 +58,7 @@ class CaseTemplateSrvTest extends PlaySpecification with TestAppBuilder {
       } must beSuccessfulTry
 
       app[Database].roTransaction { implicit graph =>
-        app[CaseTemplateSrv].get("spam").tasks.has("title", "t1").exists()
+        app[CaseTemplateSrv].get("spam").tasks.has("title", "t1").exists
       } must beTrue
     }
 
@@ -109,7 +111,7 @@ class CaseTemplateSrvTest extends PlaySpecification with TestAppBuilder {
 
       val expected: Seq[(String, JsValue)] = Seq("string1" -> JsString("hate"), "boolean1" -> JsTrue, "integer1" -> JsNumber(1))
       app[Database].roTransaction { implicit graph =>
-        app[CaseTemplateSrv].get("spam").customFields.nameJsonValue.toList
+        app[CaseTemplateSrv].get("spam").customFields.nameJsonValue.toSeq
       } must contain(exactly(expected: _*))
     }
   }
diff --git a/thehive/test/org/thp/thehive/services/DashboardSrvTest.scala b/thehive/test/org/thp/thehive/services/DashboardSrvTest.scala
index 64cdc41834..a701964170 100644
--- a/thehive/test/org/thp/thehive/services/DashboardSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/DashboardSrvTest.scala
@@ -2,9 +2,10 @@ package org.thp.thehive.services
 
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
+import org.thp.thehive.services.DashboardOps._
 import play.api.libs.json.{JsObject, Json}
 import play.api.test.PlaySpecification
 
@@ -61,10 +62,10 @@ class DashboardSrvTest extends PlaySpecification with TestAppBuilder {
     "share a dashboard" in testApp { app =>
       app[Database].tryTransaction { implicit graph =>
         for {
-          dashboard <- app[DashboardSrv].initSteps.has("title", "dashboard soc").getOrFail()
-          _ = app[DashboardSrv].get(dashboard).visible.headOption() must beNone
+          dashboard <- app[DashboardSrv].startTraversal.has("title", "dashboard soc").getOrFail("Dashboard")
+          _ = app[DashboardSrv].get(dashboard).visible.headOption must beNone
           _ <- app[DashboardSrv].share(dashboard, "cert", writable = false)
-          _ = app[DashboardSrv].get(dashboard).visible.headOption() must beSome
+          _ = app[DashboardSrv].get(dashboard).visible.headOption must beSome
         } yield ()
       } must beASuccessfulTry
     }
@@ -80,9 +81,9 @@ class DashboardSrvTest extends PlaySpecification with TestAppBuilder {
     "remove a dashboard" in testApp { app =>
       app[Database].tryTransaction { implicit graph =>
         for {
-          dashboard <- app[DashboardSrv].initSteps.has("title", "dashboard soc").getOrFail()
+          dashboard <- app[DashboardSrv].startTraversal.has("title", "dashboard soc").getOrFail("Dashboard")
           _         <- app[DashboardSrv].remove(dashboard)
-        } yield app[DashboardSrv].initSteps.has("title", "dashboard soc").exists()
+        } yield app[DashboardSrv].startTraversal.has("title", "dashboard soc").exists
       } must beASuccessfulTry(false)
     }
   }
diff --git a/thehive/test/org/thp/thehive/services/DataSrvTest.scala b/thehive/test/org/thp/thehive/services/DataSrvTest.scala
index c4195a8ee7..a0736bc89e 100644
--- a/thehive/test/org/thp/thehive/services/DataSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/DataSrvTest.scala
@@ -2,9 +2,10 @@ package org.thp.thehive.services
 
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
+import org.thp.thehive.services.DataOps._
 import play.api.test.PlaySpecification
 
 class DataSrvTest extends PlaySpecification with TestAppBuilder {
@@ -12,7 +13,7 @@ class DataSrvTest extends PlaySpecification with TestAppBuilder {
 
   "data service" should {
     "create not existing data" in testApp { app =>
-      val existingData = app[Database].roTransaction(implicit graph => app[DataSrv].initSteps.has("data", "h.fr").getOrFail()).get
+      val existingData = app[Database].roTransaction(implicit graph => app[DataSrv].startTraversal.has("data", "h.fr").getOrFail("Data")).get
       val newData      = app[Database].tryTransaction(implicit graph => app[DataSrv].create(existingData))
       newData must beSuccessfulTry.which(data => data._id shouldEqual existingData._id)
     }
@@ -21,14 +22,14 @@ class DataSrvTest extends PlaySpecification with TestAppBuilder {
       app[Database].tryTransaction { implicit graph =>
         app[ObservableSrv].create(
           Observable(Some("love"), 1, ioc = false, sighted = true),
-          app[ObservableTypeSrv].get("domain").getOrFail().get,
+          app[ObservableTypeSrv].get("domain").getOrFail("Observable").get,
           "love.com",
           Set("tagX"),
           Nil
         )
       }
 
-      app[Database].roTransaction(implicit graph => app[DataSrv].initSteps.getByData("love.com").observables.exists() must beTrue)
+      app[Database].roTransaction(implicit graph => app[DataSrv].startTraversal.getByData("love.com").observables.exists must beTrue)
     }
   }
 }
diff --git a/thehive/test/org/thp/thehive/services/ImpactStatusSrvTest.scala b/thehive/test/org/thp/thehive/services/ImpactStatusSrvTest.scala
index 6476fb72aa..de50a29e64 100644
--- a/thehive/test/org/thp/thehive/services/ImpactStatusSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/ImpactStatusSrvTest.scala
@@ -1,16 +1,17 @@
 package org.thp.thehive.services
 
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
+import org.thp.thehive.services.ImpactStatusOps._
 import play.api.test.PlaySpecification
 
 class ImpactStatusSrvTest extends PlaySpecification with TestAppBuilder {
   "impact status service" should {
     "get values" in testApp { app =>
       app[Database].roTransaction { implicit graph =>
-        app[ImpactStatusSrv].initSteps.toList must containTheSameElementsAs(
+        app[ImpactStatusSrv].startTraversal.toSeq must containTheSameElementsAs(
           Seq(
             ImpactStatus("NoImpact"),
             ImpactStatus("WithImpact"),
@@ -18,7 +19,7 @@ class ImpactStatusSrvTest extends PlaySpecification with TestAppBuilder {
           )
         )
 
-        app[ImpactStatusSrv].initSteps.getByName("NoImpact").exists() must beTrue
+        app[ImpactStatusSrv].startTraversal.getByName("NoImpact").exists must beTrue
       }
     }
   }
diff --git a/thehive/test/org/thp/thehive/services/UserSrvTest.scala b/thehive/test/org/thp/thehive/services/UserSrvTest.scala
index 0bdc94a362..49c9b790d7 100644
--- a/thehive/test/org/thp/thehive/services/UserSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/UserSrvTest.scala
@@ -2,9 +2,11 @@ package org.thp.thehive.services
 
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models._
+import org.thp.thehive.services.OrganisationOps._
+import org.thp.thehive.services.UserOps._
 import play.api.test.PlaySpecification
 
 import scala.util.{Failure, Success}
@@ -44,15 +46,15 @@ class UserSrvTest extends PlaySpecification with TestAppBuilder {
     }
 
     "deduplicate users in an organisation" in testApp { app =>
-      val db              = app[Database]
+      implicit val db     = app[Database]
       val userSrv         = app[UserSrv]
       val organisationSrv = app[OrganisationSrv]
       val profileSrv      = app[ProfileSrv]
       val roleSrv         = app[RoleSrv]
       db.tryTransaction { implicit graph =>
-        val certadmin = userSrv.get("certadmin@thehive.local").head()
-        val cert      = organisationSrv.get("cert").head()
-        val analyst   = profileSrv.get("analyst").head()
+        val certadmin = userSrv.get("certadmin@thehive.local").head
+        val cert      = organisationSrv.get("cert").head
+        val analyst   = profileSrv.get("analyst").head
         roleSrv.create(certadmin, cert, analyst).get
         val userCount = userSrv.get("certadmin@thehive.local").organisations.get("cert").getCount
         if (userCount == 2) Success(())
diff --git a/thehive/test/org/thp/thehive/services/notification/notifiers/NotificationTemplateTest.scala b/thehive/test/org/thp/thehive/services/notification/notifiers/NotificationTemplateTest.scala
index 777e86c595..6113ad6d5f 100644
--- a/thehive/test/org/thp/thehive/services/notification/notifiers/NotificationTemplateTest.scala
+++ b/thehive/test/org/thp/thehive/services/notification/notifiers/NotificationTemplateTest.scala
@@ -3,8 +3,8 @@ package org.thp.thehive.services.notification.notifiers
 import java.util.{HashMap => JHashMap}
 
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.models.{Database, DummyUserSrv, Schema}
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.services.{AuditSrv, CaseSrv, UserSrv}
 import play.api.test.PlaySpecification
@@ -13,10 +13,12 @@ import scala.collection.JavaConverters._
 
 class NotificationTemplateTest extends PlaySpecification with TestAppBuilder {
   implicit val authContext: AuthContext = DummyUserSrv(userId = "certuser@thehive.local").authContext
-  val templateEngine: Template          = new Object with Template {}
+  def templateEngine(testSchema: Schema): Template = new Object with Template {
+    val schema = testSchema
+  }
 
   "template engine" should {
-    "format message" in {
+    "format message" in testApp { app =>
       val template =
         """Dear {{user.name}},
           |you have a new notification:
@@ -42,7 +44,7 @@ class NotificationTemplateTest extends PlaySpecification with TestAppBuilder {
       model.put("object", Map("_type" -> "Case", "title" -> "case title").asJava)
       model.put("user", Map("name"    -> "Thomas").asJava)
       model.put("context", Map("_id"  -> "2231").asJava)
-      val message = templateEngine.handlebars.compileInline(template).apply(model)
+      val message = templateEngine(app[Schema]).handlebars.compileInline(template).apply(model)
       message must beEqualTo("""Dear Thomas,
                                |you have a new notification:
                                |
@@ -75,12 +77,12 @@ class NotificationTemplateTest extends PlaySpecification with TestAppBuilder {
 
       val message = app[Database].tryTransaction { implicit graph =>
         for {
-          case4 <- app[CaseSrv].get("#1").getOrFail()
+          case4 <- app[CaseSrv].get("#1").getOrFail("Case")
           _     <- app[CaseSrv].addTags(case4, Set("emailer test"))
           _     <- app[CaseSrv].addTags(case4, Set("emailer test")) // this is needed to make AuditSrv write Audit in DB
-          audit <- app[AuditSrv].initSteps.has("objectId", case4._id).getOrFail()
-          user  <- app[UserSrv].get("certuser@thehive.local").getOrFail()
-          msg   <- templateEngine.buildMessage(template, audit, Some(case4), Some(case4), Some(user), "http://localhost/")
+          audit <- app[AuditSrv].startTraversal.has("objectId", case4._id).getOrFail("Audit")
+          user  <- app[UserSrv].get("certuser@thehive.local").getOrFail("User")
+          msg   <- templateEngine(app[Schema]).buildMessage(template, audit, Some(case4), Some(case4), Some(user), "http://localhost/")
         } yield msg
       }
       message must beSuccessfulTry.which { m =>
diff --git a/thehive/test/org/thp/thehive/services/notification/triggers/AlertCreatedTest.scala b/thehive/test/org/thp/thehive/services/notification/triggers/AlertCreatedTest.scala
index 4695e5f20b..c51877b37a 100644
--- a/thehive/test/org/thp/thehive/services/notification/triggers/AlertCreatedTest.scala
+++ b/thehive/test/org/thp/thehive/services/notification/triggers/AlertCreatedTest.scala
@@ -3,7 +3,7 @@ package org.thp.thehive.services.notification.triggers
 import java.util.Date
 
 import org.thp.scalligraph.models.Database
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.controllers.v0.AlertCtrl
 import org.thp.thehive.dto.v0.{InputAlert, OutputAlert}
@@ -44,15 +44,15 @@ class AlertCreatedTest extends PlaySpecification with TestAppBuilder {
         status(result) should equalTo(201)
 
         val alertOutput = contentAsJson(result).as[OutputAlert]
-        val alert       = app[AlertSrv].get(alertOutput.id).getOrFail()
+        val alert       = app[AlertSrv].get(alertOutput.id).getOrFail("Alert")
 
         alert must beSuccessfulTry
 
-        val audit = app[AuditSrv].initSteps.has("objectId", alert.get._id).getOrFail()
+        val audit = app[AuditSrv].startTraversal.has("objectId", alert.get._id).getOrFail("Audit")
 
         audit must beSuccessfulTry
 
-        val organisation = app[OrganisationSrv].get("cert").getOrFail()
+        val organisation = app[OrganisationSrv].get("cert").getOrFail("Organisation")
 
         organisation must beSuccessfulTry
 
diff --git a/thehive/test/org/thp/thehive/services/notification/triggers/TaskAssignedTest.scala b/thehive/test/org/thp/thehive/services/notification/triggers/TaskAssignedTest.scala
index 6e90e12944..5a4c48d873 100644
--- a/thehive/test/org/thp/thehive/services/notification/triggers/TaskAssignedTest.scala
+++ b/thehive/test/org/thp/thehive/services/notification/triggers/TaskAssignedTest.scala
@@ -2,8 +2,9 @@ package org.thp.thehive.services.notification.triggers
 
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.steps.StepsOps._
+import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.TestAppBuilder
+import org.thp.thehive.services.UserOps._
 import org.thp.thehive.services._
 import play.api.test.PlaySpecification
 
@@ -14,13 +15,13 @@ class TaskAssignedTest extends PlaySpecification with TestAppBuilder {
     "be properly triggered on task assignment" in testApp { app =>
       app[Database].tryTransaction { implicit graph =>
         for {
-          task1 <- app[TaskSrv].initSteps.has("title", "case 1 task 1").getOrFail()
-          user1 <- app[UserSrv].initSteps.getByName("certuser@thehive.local").getOrFail()
-          user2 <- app[UserSrv].initSteps.getByName("certadmin@thehive.local").getOrFail()
+          task1 <- app[TaskSrv].startTraversal.has("title", "case 1 task 1").getOrFail("Task")
+          user1 <- app[UserSrv].startTraversal.getByName("certuser@thehive.local").getOrFail("User")
+          user2 <- app[UserSrv].startTraversal.getByName("certadmin@thehive.local").getOrFail("User")
           _     <- app[TaskSrv].assign(task1, user1)
           _     <- app[AuditSrv].flushPendingAudit()
-          audit <- app[AuditSrv].initSteps.has("objectId", task1._id).getOrFail()
-          orga  <- app[OrganisationSrv].get("cert").getOrFail()
+          audit <- app[AuditSrv].startTraversal.has("objectId", task1._id).getOrFail("Audit")
+          orga  <- app[OrganisationSrv].get("cert").getOrFail("Organisation")
           taskAssignedTrigger = new TaskAssigned(app[TaskSrv])
           _                   = taskAssignedTrigger.filter(audit, Some(task1), orga, Some(user1)) must beTrue
           _                   = taskAssignedTrigger.filter(audit, Some(task1), orga, Some(user2)) must beFalse