diff --git a/ScalliGraph b/ScalliGraph
index 2426d2e5f1..a612bcd28d 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit 2426d2e5f19ae24ed7c114d5ebd3c902027a6679
+Subproject commit a612bcd28dffd617d29ecfd5d0511e3d5ed3666d
diff --git a/conf/logback.xml b/conf/logback.xml
index 52ba1c47b9..94caf258db 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -36,6 +36,8 @@
 
     <logger name="org.thp.scalligraph.models" level="TRACE"/>
     <logger name="org.thp.scalligraph.traversal" level="TRACE"/>
+    <logger name="org.thp.thehive.services.StreamSrv" level="INFO"/>
+    <logger name="org.thp.thehive.services.StreamActor" level="INFO"/>
     <!--
     <logger name="org.janusgraph.graphdb" level="INFO" />
     <logger name="org.thp.thehive.client" level="DEBUG" />
diff --git a/cortex/connector/src/main/resources/play/reference-overrides.conf b/cortex/connector/src/main/resources/play/reference-overrides.conf
index 324d422143..d2863a52ff 100644
--- a/cortex/connector/src/main/resources/play/reference-overrides.conf
+++ b/cortex/connector/src/main/resources/play/reference-overrides.conf
@@ -1,12 +1,12 @@
 akka {
   actor {
     serializers {
-      cortex-schema-updater = "org.thp.thehive.connector.cortex.models.SchemaUpdaterSerializer"
+      //cortex-schema-updater = "org.thp.thehive.connector.cortex.models.SchemaUpdaterSerializer"
       cortex-jobs = "org.thp.thehive.connector.cortex.services.CortexSerializer"
     }
 
     serialization-bindings {
-      "org.thp.thehive.connector.cortex.models.SchemaUpdaterMessage" = cortex-schema-updater
+      //"org.thp.thehive.connector.cortex.models.SchemaUpdaterMessage" = cortex-schema-updater
       "org.thp.thehive.connector.cortex.services.CortexActorMessage" = cortex-jobs
     }
   }
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 0b28a004ef..6231600670 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
@@ -44,7 +44,7 @@ class CortexQueryExecutor @Inject() (
     case tpe if SubType(tpe, ru.typeOf[Traversal.V[Job]]) => ru.typeOf[Traversal.V[Observable]]
   }
 
-  override val customFilterQuery: FilterQuery = FilterQuery(db, publicProperties) { (tpe, globalParser) =>
+  override val customFilterQuery: FilterQuery = FilterQuery(publicProperties) { (tpe, globalParser) =>
     FieldsParser("parentChildFilter") {
       case (_, FObjOne("_parent", ParentIdFilter(_, parentId))) if parentTypes.isDefinedAt(tpe) =>
         Good(new CortexParentIdInputFilter(parentId))
@@ -60,7 +60,6 @@ class CortexQueryExecutor @Inject() (
 
 class CortexParentIdInputFilter(parentId: String) extends InputQuery[Traversal.Unk, Traversal.Unk] {
   override def apply(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -78,7 +77,6 @@ class CortexParentIdInputFilter(parentId: String) extends InputQuery[Traversal.U
   */
 class CortexParentQueryInputFilter(parentFilter: InputQuery[Traversal.Unk, Traversal.Unk]) extends InputQuery[Traversal.Unk, Traversal.Unk] {
   override def apply(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -86,7 +84,6 @@ class CortexParentQueryInputFilter(parentFilter: InputQuery[Traversal.Unk, Trave
   ): 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],
@@ -100,7 +97,6 @@ class CortexParentQueryInputFilter(parentFilter: InputQuery[Traversal.Unk, Trave
 class CortexChildQueryInputFilter(childType: String, childFilter: InputQuery[Traversal.Unk, Traversal.Unk])
     extends InputQuery[Traversal.Unk, Traversal.Unk] {
   override def apply(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -108,7 +104,6 @@ class CortexChildQueryInputFilter(childType: String, childFilter: InputQuery[Tra
   ): 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],
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 3fe038f67c..a857dcaacd 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
@@ -1,10 +1,9 @@
 package org.thp.thehive.connector.cortex.models
 
 import java.util.Date
-
-import org.apache.tinkerpop.gremlin.structure.{Edge, Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.{Edge, Vertex}
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.traversal.Converter
+import org.thp.scalligraph.traversal.{Converter, Graph}
 import org.thp.scalligraph.{BuildVertexEntity, EntityId}
 import play.api.libs.json.JsObject
 
@@ -67,7 +66,7 @@ object ActionContext extends HasModel {
         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 =
+    override def create(e: ActionContext, from: Vertex, to: Vertex)(implicit graph: Graph): Edge =
       from.addEdge(label, to)
   }
 }
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/SchemaUpdaterActor.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/SchemaUpdaterActor.scala
deleted file mode 100644
index 958a6c3ce0..0000000000
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/SchemaUpdaterActor.scala
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.thp.thehive.connector.cortex.models
-
-import akka.actor.{Actor, ActorRef, ActorSystem, PoisonPill, Props}
-import akka.cluster.singleton.{ClusterSingletonManager, ClusterSingletonManagerSettings, ClusterSingletonProxy, ClusterSingletonProxySettings}
-import akka.pattern.ask
-import akka.util.Timeout
-import org.thp.scalligraph.models.Database
-import org.thp.thehive.services.LocalUserSrv
-import play.api.Logger
-
-import javax.inject.{Inject, Named, Provider, Singleton}
-import scala.concurrent.Await
-import scala.concurrent.duration.DurationInt
-
-@Singleton
-class DatabaseProvider @Inject() (
-    cortexSchema: CortexSchemaDefinition,
-    @Named("with-thehive-schema") database: Database,
-    actorSystem: ActorSystem
-) extends Provider[Database] {
-  lazy val schemaUpdaterActor: ActorRef = {
-    val singletonManager =
-      actorSystem.actorOf(
-        ClusterSingletonManager.props(
-          singletonProps = Props(classOf[SchemaUpdaterActor], cortexSchema, database),
-          terminationMessage = PoisonPill,
-          settings = ClusterSingletonManagerSettings(actorSystem)
-        ),
-        name = "theHiveCortexSchemaUpdaterSingletonManager"
-      )
-
-    actorSystem.actorOf(
-      ClusterSingletonProxy.props(
-        singletonManagerPath = singletonManager.path.toStringWithoutAddress,
-        settings = ClusterSingletonProxySettings(actorSystem)
-      ),
-      name = "theHiveCortexSchemaUpdaterSingletonProxy"
-    )
-  }
-
-  override def get(): Database = {
-    implicit val timeout: Timeout = Timeout(5.minutes)
-    Await.result(schemaUpdaterActor ? RequestDB, timeout.duration) match {
-      case DBReady => database
-    }
-  }
-}
-
-sealed trait SchemaUpdaterMessage
-case object RequestDB extends SchemaUpdaterMessage
-case object DBReady   extends SchemaUpdaterMessage
-
-class SchemaUpdaterActor @Inject() (cortexSchema: CortexSchemaDefinition, database: Database) extends Actor {
-  lazy val logger: Logger = Logger(getClass)
-
-  def update(): Unit = {
-    cortexSchema
-      .update(database)(LocalUserSrv.getSystemAuthContext)
-      .recover {
-        case error => logger.error(s"Database with CortexSchema schema update failure", error)
-      }
-    ()
-  }
-
-  override def receive: Receive = {
-    case RequestDB =>
-      update()
-      sender ! DBReady
-      context.become(databaseUpToDate)
-  }
-
-  def databaseUpToDate: Receive = {
-    case RequestDB =>
-      sender ! DBReady
-  }
-}
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/SchemaUpdaterSerializer.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/SchemaUpdaterSerializer.scala
deleted file mode 100644
index 27e4acc7cb..0000000000
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/SchemaUpdaterSerializer.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.thp.thehive.connector.cortex.models
-
-import akka.serialization.Serializer
-
-import java.io.NotSerializableException
-
-class SchemaUpdaterSerializer extends Serializer {
-  override def identifier: Int = -639734235
-
-  override def includeManifest: Boolean = false
-
-  override def toBinary(o: AnyRef): Array[Byte] =
-    o match {
-      case RequestDB => Array(0)
-      case DBReady   => Array(1)
-      case _         => throw new NotSerializableException
-    }
-
-  override def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): AnyRef =
-    bytes(0) match {
-      case 0 => RequestDB
-      case 1 => DBReady
-      case _ => throw new NotSerializableException
-    }
-}
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 2839e10596..77e89b7a08 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
@@ -1,11 +1,10 @@
 package org.thp.thehive.connector.cortex.services
 
 import java.util.Date
-
 import javax.inject.Inject
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{EntityIdOrName, InternalError}
 import org.thp.thehive.connector.cortex.models._
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 79d97e3a23..49d52a63d6 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,18 +1,18 @@
 package org.thp.thehive.connector.cortex.services
 
 import java.util.{Date, Map => JMap}
-
 import akka.actor.ActorRef
 import com.google.inject.name.Named
+
 import javax.inject.Inject
-import org.apache.tinkerpop.gremlin.structure.{Element, Graph}
+import org.apache.tinkerpop.gremlin.structure.Element
 import org.thp.cortex.client.CortexClient
 import org.thp.cortex.dto.v0.{InputAction => CortexAction, OutputJob => CortexJob}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.services._
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.scalligraph.{EntityId, NotFoundError}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.models._
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 0467ddd4c2..cfdb010ebd 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
@@ -1,15 +1,14 @@
 package org.thp.thehive.connector.cortex.services
 
 import java.util.zip.{ZipEntry, ZipFile}
-
 import com.google.inject.name.Named
+
 import javax.inject.{Inject, 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.query.PropertyUpdater
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{CreateError, EntityIdOrName, EntityName}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
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 4aa4767c55..70a6c080aa 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
@@ -14,9 +14,9 @@ import org.thp.thehive.services.{AuditSrv, UserSrv}
 class CortexAuditSrv @Inject() (
     userSrvProvider: Provider[UserSrv],
     @Named("notification-actor") notificationActor: ActorRef,
-    eventSrv: EventSrv
-)(implicit @Named("with-thehive-cortex-schema") db: Database)
-    extends AuditSrv(userSrvProvider, notificationActor, eventSrv) {
+    eventSrv: EventSrv,
+    db: Database
+) extends AuditSrv(userSrvProvider, notificationActor, eventSrv, db) {
 
   val job              = new ObjectAudit[Job, Observable]
   val action           = new ObjectAudit[Action, Product with Entity]
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 9e767333f8..819f96c893 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,9 +1,9 @@
 package org.thp.thehive.connector.cortex.services
 
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{BadRequestError, EntityIdOrName}
 import org.thp.thehive.models._
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 f8477a3baf..c3deb46ba2 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
@@ -2,24 +2,23 @@ package org.thp.thehive.connector.cortex.services
 
 import java.nio.file.Files
 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 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, JobStatus => CortexJobStatus}
+import org.thp.cortex.dto.v0.{InputArtifact, OutputArtifact, Attachment => CortexAttachment, JobStatus => CortexJobStatus, OutputJob => CortexJob}
 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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, StepLabel, Traversal}
 import org.thp.scalligraph.{EntityId, EntityIdOrName, NotFoundError}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.models._
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunAnalyzer.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunAnalyzer.scala
index c292c513a9..2eecc387fb 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunAnalyzer.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunAnalyzer.scala
@@ -1,8 +1,8 @@
 package org.thp.thehive.connector.cortex.services.notification.notifiers
 
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{BadConfigurationError, NotFoundError, RichOption}
 import org.thp.thehive.connector.cortex.services.{AnalyzerSrv, JobSrv}
diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunResponder.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunResponder.scala
index 8d50288980..68e5b8e009 100644
--- a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunResponder.scala
+++ b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/notification/notifiers/RunResponder.scala
@@ -1,9 +1,10 @@
 package org.thp.thehive.connector.cortex.services.notification.notifiers
 
 import com.typesafe.config.ConfigRenderOptions
+
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{BadConfigurationError, NotFoundError, RichOption}
 import org.thp.thehive.connector.cortex.services.{ActionSrv, ResponderSrv}
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 0ec7681f11..ed415e4d2c 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,11 +2,12 @@ package org.thp.thehive.migration.th4
 
 import akka.actor.ActorRef
 import com.google.inject.name.Named
+
 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
+import org.thp.scalligraph.traversal.Graph
 import org.thp.thehive.models.Audit
 import org.thp.thehive.services.{AuditSrv, UserSrv}
 
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 d6575d9963..42be27c782 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
@@ -6,13 +6,12 @@ import com.google.inject.Guice
 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, UMapping}
 import org.thp.scalligraph.services._
-import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, 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}
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 bf71fb3ed4..369e6ed6a7 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
@@ -1,12 +1,11 @@
 package org.thp.thehive.connector.misp.services
 
 import java.util.Date
-
 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.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AuthorizationError, BadRequestError, NotFoundError}
 import org.thp.thehive.models._
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 f4a5990d2b..98601460ef 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
@@ -4,11 +4,11 @@ import akka.stream.Materializer
 import akka.stream.scaladsl.{FileIO, Sink, Source}
 import akka.util.ByteString
 import org.apache.tinkerpop.gremlin.process.traversal.P
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.misp.dto.{Attribute, Event, Tag => MispTag}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models._
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.FunctionalCondition._
 import org.thp.scalligraph.{EntityName, RichSeq}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 8b8c345296..6027c26778 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -15,46 +15,47 @@ object Dependencies {
   lazy val akkaClusterTyped        = "com.typesafe.akka"        %% "akka-cluster-typed"                 % akkaVersion
   lazy val akkaHttp                = "com.typesafe.akka"        %% "akka-http"                          % "10.1.12"
   lazy val akkaHttpXml             = "com.typesafe.akka"        %% "akka-http-xml"                      % "10.1.12"
-  lazy val janusGraph              = "org.janusgraph"           % "janusgraph"                          % janusVersion
-  lazy val janusGraphCore          = "org.janusgraph"           % "janusgraph-core"                     % janusVersion
-  lazy val janusGraphBerkeleyDB    = "org.janusgraph"           % "janusgraph-berkeleyje"               % janusVersion
-  lazy val janusGraphHBase         = "org.janusgraph"           % "janusgraph-hbase"                    % janusVersion
-  lazy val janusGraphLucene        = "org.janusgraph"           % "janusgraph-lucene"                   % janusVersion
-  lazy val janusGraphElasticSearch = "org.janusgraph"           % "janusgraph-es"                       % janusVersion
-  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 janusGraph              = "org.janusgraph"            % "janusgraph"                         % janusVersion
+  lazy val janusGraphCore          = "org.janusgraph"            % "janusgraph-core"                    % janusVersion
+  lazy val janusGraphBerkeleyDB    = "org.janusgraph"            % "janusgraph-berkeleyje"              % janusVersion
+  lazy val janusGraphHBase         = "org.janusgraph"            % "janusgraph-hbase"                   % janusVersion
+  lazy val janusGraphLucene        = "org.janusgraph"            % "janusgraph-lucene"                  % janusVersion
+  lazy val janusGraphElasticSearch = "org.janusgraph"            % "janusgraph-es"                      % janusVersion
+  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 gremlinDriver           = "org.apache.tinkerpop"      % "gremlin-driver"                     % "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")
+  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")
   lazy val scalactic               = "org.scalactic"            %% "scalactic"                          % "3.1.1"
   lazy val scalaGuice              = "net.codingwell"           %% "scala-guice"                        % "4.2.6"
   lazy val sangria                 = "org.sangria-graphql"      %% "sangria"                            % "1.4.2"
   lazy val sangriaPlay             = "org.sangria-graphql"      %% "sangria-play-json"                  % "1.0.5"
   lazy val shapeless               = "com.chuusai"              %% "shapeless"                          % "2.3.3"
-  lazy val bouncyCastle            = "org.bouncycastle"         % "bcprov-jdk15on"                      % "1.65"
-  lazy val neo4jGremlin            = "org.apache.tinkerpop"     % "neo4j-gremlin"                       % "3.3.4"
-  lazy val neo4jTinkerpop          = "org.neo4j"                % "neo4j-tinkerpop-api-impl"            % "0.7-3.2.3" exclude ("org.slf4j", "slf4j-nop")
-  lazy val apacheConfiguration     = "commons-configuration"    % "commons-configuration"               % "1.10"
-  lazy val macroParadise           = "org.scalamacros"          % "paradise"                            % "2.1.1" cross CrossVersion.full
+  lazy val bouncyCastle            = "org.bouncycastle"          % "bcprov-jdk15on"                     % "1.65"
+  lazy val neo4jGremlin            = "org.apache.tinkerpop"      % "neo4j-gremlin"                      % "3.3.4"
+  lazy val neo4jTinkerpop          = "org.neo4j"                 % "neo4j-tinkerpop-api-impl"           % "0.7-3.2.3" exclude ("org.slf4j", "slf4j-nop")
+  lazy val apacheConfiguration     = "commons-configuration"     % "commons-configuration"              % "1.10"
+  lazy val macroParadise           = "org.scalamacros"           % "paradise"                           % "2.1.1" cross CrossVersion.full
   lazy val chimney                 = "io.scalaland"             %% "chimney"                            % "0.4.0"
   lazy val elastic4sCore           = "com.sksamuel.elastic4s"   %% "elastic4s-core"                     % elastic4sVersion
   lazy val elastic4sHttpStreams    = "com.sksamuel.elastic4s"   %% "elastic4s-http-streams"             % elastic4sVersion
   lazy val elastic4sHttp           = "com.sksamuel.elastic4s"   %% "elastic4s-http"                     % elastic4sVersion
-  lazy val log4jOverSlf4j          = "org.slf4j"                % "log4j-over-slf4j"                    % "1.7.25"
-  lazy val log4jToSlf4j            = "org.apache.logging.log4j" % "log4j-to-slf4j"                      % "2.9.1"
-  lazy val reflections             = "org.reflections"          % "reflections"                         % "0.9.12"
-  lazy val hadoopClient            = "org.apache.hadoop"        % "hadoop-client"                       % "3.2.1"
-  lazy val zip4j                   = "net.lingala.zip4j"        % "zip4j"                               % "2.3.1"
+  lazy val log4jOverSlf4j          = "org.slf4j"                 % "log4j-over-slf4j"                   % "1.7.25"
+  lazy val log4jToSlf4j            = "org.apache.logging.log4j"  % "log4j-to-slf4j"                     % "2.9.1"
+  lazy val reflections             = "org.reflections"           % "reflections"                        % "0.9.12"
+  lazy val hadoopClient            = "org.apache.hadoop"         % "hadoop-client"                      % "3.2.1"
+  lazy val zip4j                   = "net.lingala.zip4j"         % "zip4j"                              % "2.3.1"
   lazy val alpakka                 = "com.lightbend.akka"       %% "akka-stream-alpakka-json-streaming" % "1.1.2"
-  lazy val handlebars              = "com.github.jknack"        % "handlebars"                          % "4.1.2"
+  lazy val handlebars              = "com.github.jknack"         % "handlebars"                         % "4.1.2"
   lazy val playMailer              = "com.typesafe.play"        %% "play-mailer"                        % "7.0.1"
   lazy val playMailerGuice         = "com.typesafe.play"        %% "play-mailer-guice"                  % "7.0.1"
-  lazy val jts                     = "com.vividsolutions"       % "jts"                                 % "1.13"
+  lazy val jts                     = "com.vividsolutions"        % "jts"                                % "1.13"
   lazy val pbkdf2                  = "io.github.nremond"        %% "pbkdf2-scala"                       % "0.6.5"
   lazy val alpakkaS3               = "com.lightbend.akka"       %% "akka-stream-alpakka-s3"             % "1.1.2"
-  lazy val commonCodec             = "commons-codec"            % "commons-codec"                       % "1.11"
+  lazy val commonCodec             = "commons-codec"             % "commons-codec"                      % "1.11"
   lazy val scopt                   = "com.github.scopt"         %% "scopt"                              % "4.0.0-RC2"
 
   def scalaReflect(scalaVersion: String)  = "org.scala-lang" % "scala-reflect"  % scalaVersion
diff --git a/thehive/app/org/thp/thehive/controllers/dav/VFS.scala b/thehive/app/org/thp/thehive/controllers/dav/VFS.scala
index ac2c7b8c16..68416352b9 100644
--- a/thehive/app/org/thp/thehive/controllers/dav/VFS.scala
+++ b/thehive/app/org/thp/thehive/controllers/dav/VFS.scala
@@ -1,8 +1,8 @@
 package org.thp.thehive.controllers.dav
 
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.auth.AuthContext
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.services.CaseOps._
 import org.thp.thehive.services.CaseSrv
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
index d0ba0e18fe..6c79f2f0e8 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AlertCtrl.scala
@@ -1,16 +1,15 @@
 package org.thp.thehive.controllers.v0
 
 import java.util.{Base64, List => JList, Map => JMap}
-
 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._
 import org.thp.scalligraph.models.{Database, UMapping}
 import org.thp.scalligraph.query._
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, IdentityConverter, IteratorOutput, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, IdentityConverter, IteratorOutput, Traversal}
 import org.thp.scalligraph.{AuthorizationError, BadRequestError, EntityId, EntityIdOrName, EntityName, InvalidFormatAttributeError, RichSeq}
 import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.{InputAlert, InputObservable, OutputSimilarCase}
@@ -435,12 +434,12 @@ class PublicAlert @Inject() (
           alertSteps.customFields(EntityIdOrName(name)).jsonValue
         case (_, alertSteps) => alertSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
       }.custom {
-        case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
+        case (FPathElem(_, FPathElem(name, _)), value, vertex, graph, authContext) =>
           for {
             c <- alertSrv.getByIds(EntityId(vertex.id))(graph).getOrFail("Alert")
             _ <- alertSrv.setOrCreateCustomField(c, InputCustomFieldValue(name, Some(value), None))(graph, authContext)
           } yield Json.obj(s"customField.$name" -> value)
-        case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
+        case (FPathElem(_, FPathEmpty), values: JsObject, vertex, graph, authContext) =>
           for {
             c   <- alertSrv.get(vertex)(graph).getOrFail("Alert")
             cfv <- values.fields.toTry { case (n, v) => customFieldSrv.getOrFail(EntityIdOrName(n))(graph).map(_ -> v) }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala b/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala
index 51f18fea54..4c0f0e8cb0 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/AuditRenderer.scala
@@ -2,7 +2,7 @@ package org.thp.thehive.controllers.v0
 
 import java.util.{Date, Map => JMap}
 
-import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.{Vertex}
 import org.thp.scalligraph.models.UMapping
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.traversal._
diff --git a/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala
index f8fcd8aeed..cf8a35cf67 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/CaseCtrl.scala
@@ -257,7 +257,7 @@ class PublicCase @Inject() (
       .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) =>
+      .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(u => userSrv.get(EntityIdOrName(u))(graph).getOrFail("User")).flip
@@ -268,7 +268,7 @@ class PublicCase @Inject() (
         } yield Json.obj("owner" -> user.map(_.login))
       })
       .property("resolutionStatus", UMapping.string.optional)(_.select(_.resolutionStatus.value(_.value)).custom {
-        (_, resolutionStatus, vertex, _, graph, authContext) =>
+        (_, resolutionStatus, vertex, graph, authContext) =>
           for {
             c <- caseSrv.get(vertex)(graph).getOrFail("Case")
             _ <- resolutionStatus match {
@@ -278,7 +278,7 @@ class PublicCase @Inject() (
           } yield Json.obj("resolutionStatus" -> resolutionStatus)
       })
       .property("impactStatus", UMapping.string.optional)(_.select(_.impactStatus.value(_.value)).custom {
-        (_, impactStatus, vertex, _, graph, authContext) =>
+        (_, impactStatus, vertex, graph, authContext) =>
           for {
             c <- caseSrv.get(vertex)(graph).getOrFail("Case")
             _ <- impactStatus match {
@@ -332,12 +332,12 @@ class PublicCase @Inject() (
           case _ => (x: JsValue) => x
         }
         .custom {
-          case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
+          case (FPathElem(_, FPathElem(name, _)), value, vertex, graph, authContext) =>
             for {
               c <- caseSrv.get(vertex)(graph).getOrFail("Case")
               _ <- caseSrv.setOrCreateCustomField(c, EntityIdOrName(name), Some(value), None)(graph, authContext)
             } yield Json.obj(s"customField.$name" -> value)
-          case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
+          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(EntityIdOrName(n))(graph).map(cf => (cf, v, None)) }
diff --git a/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala
index 0c23b45f7c..796eafbc7e 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/CaseTemplateCtrl.scala
@@ -156,12 +156,12 @@ class PublicCaseTemplate @Inject() (
       case (FPathElem(_, FPathElem(name, _)), caseTemplateSteps) => caseTemplateSteps.customFields(name).jsonValue
       case (_, caseTemplateSteps)                                => caseTemplateSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
     }.custom {
-      case (FPathElem(_, FPathElem(name, _)), value, vertex, _, graph, authContext) =>
+      case (FPathElem(_, FPathElem(name, _)), value, vertex, graph, authContext) =>
         for {
           c <- caseTemplateSrv.get(vertex)(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) =>
+      case (FPathElem(_, FPathEmpty), values: JsObject, vertex, graph, authContext) =>
         for {
           c   <- caseTemplateSrv.get(vertex)(graph).getOrFail("CaseTemplate")
           cfv <- values.fields.toTry { case (n, v) => customFieldSrv.getOrFail(EntityIdOrName(n))(graph).map(_ -> v) }
@@ -171,7 +171,7 @@ class PublicCaseTemplate @Inject() (
     })
     .property("tasks", UMapping.jsonNative.sequence)(
       _.select(_.tasks.richTaskWithoutActionRequired.domainMap(_.toJson)).custom { //  FIXME select the correct mapping
-        (_, value, vertex, _, graph, authContext) =>
+        (_, value, vertex, graph, authContext) =>
           val fp = FieldsParser[InputTask]
 
           caseTemplateSrv.get(vertex)(graph).tasks.remove()
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ConfigCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ConfigCtrl.scala
index 4b58eab688..3de29d0a34 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ConfigCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ConfigCtrl.scala
@@ -1,7 +1,6 @@
 package org.thp.thehive.controllers.v0
 
 import com.typesafe.config.{ConfigRenderOptions, Config => TypeSafeConfig}
-import javax.inject.{Inject, Named, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
@@ -15,6 +14,7 @@ import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent, Result, Results}
 import play.api.{ConfigLoader, Configuration, Logger}
 
+import javax.inject.{Inject, Singleton}
 import scala.util.{Failure, Success, Try}
 
 @Singleton
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
index 309afaaf5f..578990253f 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
@@ -112,25 +112,25 @@ class PublicDashboard @Inject() (
     .property("status", UMapping.string)(
       _.select(_.choose(_.organisation, "Shared", "Private"))
         .custom {
-          case (_, "Shared", vertex, _, graph, authContext) =>
+          case (_, "Shared", vertex, graph, authContext) =>
             for {
               dashboard <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
               _         <- dashboardSrv.share(dashboard, authContext.organisation, writable = false)(graph, authContext)
             } yield Json.obj("status" -> "Shared")
 
-          case (_, "Private", vertex, _, graph, authContext) =>
+          case (_, "Private", vertex, graph, authContext) =>
             for {
               d <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
               _ <- dashboardSrv.unshare(d, authContext.organisation)(graph, authContext)
             } yield Json.obj("status" -> "Private")
 
-          case (_, "Deleted", vertex, _, graph, authContext) =>
+          case (_, "Deleted", vertex, graph, authContext) =>
             for {
               d <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
               _ <- dashboardSrv.remove(d)(graph, authContext)
             } yield Json.obj("status" -> "Deleted")
 
-          case (_, status, _, _, _, _) =>
+          case (_, status, _, _, _) =>
             Failure(InvalidFormatAttributeError("status", "String", Set("Shared", "Private", "Deleted"), FString(status)))
         }
     )
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala
index e7bcf77a20..6e844f4eb3 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/DescribeCtrl.scala
@@ -2,7 +2,7 @@ package org.thp.thehive.controllers.v0
 
 import java.lang.{Boolean => JBoolean}
 import java.util.Date
-import javax.inject.{Inject, Named, Singleton}
+import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.{EntityId, NotFoundError}
 import org.thp.scalligraph.controllers.Entrypoint
 import org.thp.scalligraph.models.Database
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala
index 2e0e96da88..dfec8da9ca 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ListCtrl.scala
@@ -1,6 +1,6 @@
 package org.thp.thehive.controllers.v0
 
-import javax.inject.{Inject, Named, Singleton}
+import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.traversal.TraversalOps._
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
index 1a8ba2b182..c925f0935d 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -300,22 +300,22 @@ class PublicObservable @Inject() (
     .property("sighted", UMapping.boolean)(_.field.updatable)
     .property("ignoreSimilarity", UMapping.boolean)(_.field.updatable)
     .property("tags", UMapping.string.set)(
-      _.select(_.tags.displayName)
-        .filter((_, cases) =>
-          cases
-            .tags
-            .graphMap[String, String, Converter.Identity[String]](
-              { v =>
-                val namespace = UMapping.string.getProperty(v, "namespace")
-                val predicate = UMapping.string.getProperty(v, "predicate")
-                val value     = UMapping.string.optional.getProperty(v, "value")
-                Tag(namespace, predicate, value, None, 0).toString
-              },
-              Converter.identity[String]
-            )
-        )
-        .converter(_ => Converter.identity[String])
-        .custom { (_, value, vertex, _, graph, authContext) =>
+      _.select(_.tags.displayName) // FIXME add filter
+//        .filter((_, cases) =>
+//          cases
+//            .tags
+//            .graphMap[String, String, Converter.Identity[String]](
+//              { v =>
+//                val namespace = UMapping.string.getProperty(v, "namespace")
+//                val predicate = UMapping.string.getProperty(v, "predicate")
+//                val value     = UMapping.string.optional.getProperty(v, "value")
+//                Tag(namespace, predicate, value, None, 0).toString
+//              },
+//              Converter.identity[String]
+//            )
+//        )
+//        .converter(_ => Converter.identity[String])
+        .custom { (_, value, vertex, graph, authContext) =>
           observableSrv
             .get(vertex)(graph)
             .getOrFail("Observable")
diff --git a/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala
index 3577df52f3..52087903f5 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/QueryCtrl.scala
@@ -1,13 +1,13 @@
 package org.thp.thehive.controllers.v0
 
 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.EntityIdOrName
 import org.thp.scalligraph.controllers._
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.query._
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.Traversal.Unk
 import org.thp.thehive.services.th3.TH3Aggregation
 import play.api.Logger
@@ -90,7 +90,7 @@ trait QueryCtrl {
             .map(inputFilter => filterQuery.toQuery(inputFilter))
             .fold(publicData.initialQuery)(publicData.initialQuery.andThen)
         aggs <- aggregationParser.sequence(field.get("stats"))
-      } yield aggs.map(a => filteredQuery andThen new AggregationQuery(db, queryExecutor.publicProperties, filterQuery).toQuery(a))
+      } yield aggs.map(a => filteredQuery andThen new AggregationQuery(queryExecutor.publicProperties, filterQuery).toQuery(a))
   }
 
   def searchParser(initialQuery: Query = publicData.initialQuery): FieldsParser[Query] =
@@ -103,7 +103,7 @@ trait QueryCtrl {
               .map(inputFilter => filterQuery.toQuery(inputFilter))
               .fold(initialQuery)(initialQuery.andThen)
           inputSort <- sortParser(field.get("sort"))
-          sortedQuery = filteredQuery andThen new SortQuery(db, queryExecutor.publicProperties).toQuery(inputSort)
+          sortedQuery = filteredQuery andThen new SortQuery(queryExecutor.publicProperties).toQuery(inputSort)
           outputParam <- outputParamParser.optional(field).map(_.getOrElse(OutputParam(0, 10, withStats = false, withParents = 0)))
           outputQuery = publicData.pageQuery.toQuery(outputParam)
         } yield sortedQuery andThen outputQuery
diff --git a/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala
index 4d3c6f890c..a792e0104b 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ShareCtrl.scala
@@ -1,10 +1,10 @@
 package org.thp.thehive.controllers.v0
 
 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.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AuthorizationError, BadRequestError, EntityIdOrName, RichSeq}
 import org.thp.thehive.controllers.v0.Conversion._
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
index 7cb42df840..bba39dac4b 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
@@ -136,7 +136,7 @@ class PublicTask @Inject() (taskSrv: TaskSrv, organisationSrv: OrganisationSrv,
   override val publicProperties: PublicProperties = 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) =>
+    .property("status", UMapping.enum[TaskStatus.type])(_.field.custom { (_, value, vertex, graph, authContext) =>
       for {
         task <- taskSrv.get(vertex)(graph).getOrFail("Task")
         user <-
@@ -154,7 +154,7 @@ class PublicTask @Inject() (taskSrv: TaskSrv, organisationSrv: OrganisationSrv,
     .property("group", UMapping.string)(_.field.updatable)
     .property("owner", UMapping.string.optional)(
       _.select(_.assignee.value(_.login))
-        .custom { (_, login: Option[String], vertex, _, graph, authContext) =>
+        .custom { (_, login: Option[String], vertex, graph, authContext) =>
           for {
             task <- taskSrv.get(vertex)(graph).getOrFail("Task")
             user <- login.map(l => userSrv.getOrFail(EntityIdOrName(l))(graph)).flip
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala b/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
index efd82dcf72..e5379bba12 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TheHiveQueryExecutor.scala
@@ -82,7 +82,7 @@ class TheHiveQueryExecutor @Inject() (
     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[Task]]
   }
-  override val customFilterQuery: FilterQuery = FilterQuery(db, publicProperties) { (tpe, globalParser) =>
+  override val customFilterQuery: FilterQuery = FilterQuery(publicProperties) { (tpe, globalParser) =>
     FieldsParser("parentChildFilter") {
       case (_, FObjOne("_parent", ParentIdFilter(parentType, parentId))) if parentTypes.isDefinedAt((tpe, parentType)) =>
         Good(new ParentIdInputFilter(parentType, parentId))
@@ -115,7 +115,6 @@ object ParentIdFilter {
 
 class ParentIdInputFilter(parentType: String, parentId: String) extends InputQuery[Traversal.Unk, Traversal.Unk] {
   override def apply(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -168,7 +167,6 @@ object ParentQueryFilter {
 class ParentQueryInputFilter(parentType: String, parentFilter: InputQuery[Traversal.Unk, Traversal.Unk])
     extends InputQuery[Traversal.Unk, Traversal.Unk] {
   override def apply(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -177,7 +175,6 @@ class ParentQueryInputFilter(parentType: String, parentFilter: InputQuery[Traver
     def filter[F, T: ru.TypeTag](t: Traversal.V[F] => Traversal.V[T]): Traversal.Unk =
       traversal.filter(parent =>
         parentFilter(
-          db,
           publicProperties,
           ru.typeOf[Traversal.V[T]],
           t(parent.asInstanceOf[Traversal.V[F]]).asInstanceOf[Traversal.Unk],
@@ -212,7 +209,6 @@ object ChildQueryFilter {
 class ChildQueryInputFilter(childType: String, childFilter: InputQuery[Traversal.Unk, Traversal.Unk])
     extends InputQuery[Traversal.Unk, Traversal.Unk] {
   override def apply(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -221,7 +217,6 @@ class ChildQueryInputFilter(childType: String, childFilter: InputQuery[Traversal
     def filter[F, T: ru.TypeTag](t: Traversal.V[F] => Traversal.V[T]): Traversal.Unk =
       traversal.filter(child =>
         childFilter(
-          db,
           publicProperties,
           ru.typeOf[Traversal.V[T]],
           t(child.asInstanceOf[Traversal.V[F]]).asInstanceOf[Traversal.Unk],
diff --git a/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala
index 2f46fa2bb9..37ec7b53e5 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/UserCtrl.scala
@@ -245,14 +245,14 @@ class PublicUser @Inject() (userSrv: UserSrv, organisationSrv: OrganisationSrv,
   override val extraQueries: Seq[ParamQuery[_]] = Seq()
   override val publicProperties: PublicProperties = PublicPropertyListBuilder[User]
     .property("login", UMapping.string)(_.field.readonly)
-    .property("name", UMapping.string)(_.field.custom { (_, value, vertex, db, graph, authContext) =>
+    .property("name", UMapping.string)(_.field.custom { (_, value, vertex, graph, authContext) =>
       def isCurrentUser: Try[Unit] =
         userSrv.get(vertex)(graph).current(authContext).existsOrFail
 
       def isUserAdmin: Try[Unit] =
         userSrv
           .current(graph, authContext)
-          .organisations(Permissions.manageUser)(db)
+          .organisations(Permissions.manageUser)
           .users
           .getElement(vertex)
           .existsOrFail
@@ -266,10 +266,10 @@ class PublicUser @Inject() (userSrv: UserSrv, organisationSrv: OrganisationSrv,
     })
     .property("status", UMapping.string)(
       _.select(_.choose(predicate = _.value(_.locked).is(P.eq(true)), onTrue = "Locked", onFalse = "Ok"))
-        .custom { (_, value, vertex, _, graph, authContext) =>
+        .custom { (_, value, vertex, graph, authContext) =>
           userSrv
             .current(graph, authContext)
-            .organisations(Permissions.manageUser)(db)
+            .organisations(Permissions.manageUser)
             .users
             .getElement(vertex)
             .orFail(AuthorizationError("Operation not permitted"))
diff --git a/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala
index 0a5477c2e3..448aed37f6 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/AlertCtrl.scala
@@ -56,7 +56,7 @@ class AlertCtrl @Inject() (
   override val outputQuery: Query      = Query.output[RichAlert, Traversal.V[Alert]](_.richAlert)
   val caseProperties: PublicProperties = properties.`case` ++ properties.metaProperties
   val caseFilterParser: FieldsParser[Option[InputQuery[Traversal.Unk, Traversal.Unk]]] =
-    FilterQuery.default(db, caseProperties).paramParser(ru.typeOf[Traversal.V[Case]]).optional.on("caseFilter")
+    FilterQuery.default(caseProperties).paramParser(ru.typeOf[Traversal.V[Case]]).optional.on("caseFilter")
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
     Query[Traversal.V[Alert], Traversal.V[Observable]]("observables", (alertSteps, _) => alertSteps.observables),
     Query[Traversal.V[Alert], Traversal.V[Case]]("case", (alertSteps, _) => alertSteps.`case`),
@@ -69,7 +69,7 @@ class AlertCtrl @Inject() (
       caseFilterParser,
       { (maybeCaseFilterQuery, alertSteps, authContext) =>
         val maybeCaseFilter: Option[Traversal.V[Case] => Traversal.V[Case]] =
-          maybeCaseFilterQuery.map(f => cases => f(db, caseProperties, ru.typeOf[Traversal.V[Case]], cases.cast, authContext).cast)
+          maybeCaseFilterQuery.map(f => cases => f(caseProperties, ru.typeOf[Traversal.V[Case]], cases.cast, authContext).cast)
         alertSteps.similarCases(maybeCaseFilter)(authContext).domainMap(Json.toJson(_))
       }
     )
diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
index 0440346733..5838e1010f 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/CaseCtrl.scala
@@ -29,7 +29,7 @@ class CaseCtrl @Inject() (
     userSrv: UserSrv,
     tagSrv: TagSrv,
     organisationSrv: OrganisationSrv,
-    @Named("with-thehive-schema") implicit val db: Database
+    db: Database
 ) extends QueryableCtrl
     with CaseRenderer {
 
diff --git a/thehive/app/org/thp/thehive/controllers/v1/Properties.scala b/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
index fae8188f4e..fff921827f 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/Properties.scala
@@ -129,12 +129,12 @@ class Properties @Inject() (
           case _ => (x: JsValue) => x
         }
         .custom {
-          case (FPathElem(_, FPathElem(idOrName, _)), value, vertex, _, graph, authContext) =>
+          case (FPathElem(_, FPathElem(idOrName, _)), value, vertex, graph, authContext) =>
             for {
               c <- caseSrv.get(vertex)(graph).getOrFail("Case")
               _ <- caseSrv.setOrCreateCustomField(c, EntityIdOrName(idOrName), Some(value), None)(graph, authContext)
             } yield Json.obj(s"customField.$idOrName" -> value)
-          case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
+          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(EntityIdOrName(n))(graph).map(cf => (cf, v, None)) }
@@ -193,11 +193,8 @@ class Properties @Inject() (
       .property("pap", UMapping.int)(_.field.updatable)
       .property("status", UMapping.enum[CaseStatus.type])(_.field.updatable)
       .property("summary", UMapping.string.optional)(_.field.updatable)
-      .property("actionRequired", UMapping.boolean)(_
-        .authSelect((t, auth) => t.isActionRequired(auth))
-        .readonly
-      )
-      .property("assignee", UMapping.string.optional)(_.select(_.user.value(_.login)).custom { (_, login, vertex, _, graph, authContext) =>
+      .property("actionRequired", UMapping.boolean)(_.authSelect((t, auth) => t.isActionRequired(auth)).readonly)
+      .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(u => userSrv.get(EntityIdOrName(u))(graph).getOrFail("User")).flip
@@ -207,18 +204,17 @@ class Properties @Inject() (
           }
         } yield Json.obj("owner" -> user.map(_.login))
       })
-      .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("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", UMapping.string.optional)(_.select(_.resolutionStatus.value(_.value)).custom {
-        (_, value, vertex, _, graph, authContext) =>
+        (_, value, vertex, graph, authContext) =>
           caseSrv
             .get(vertex)(graph)
             .getOrFail("Case")
@@ -234,43 +230,22 @@ class Properties @Inject() (
             .jsonValue
         case (_, caseSteps) => caseSteps.customFields.nameJsonValue.fold.domainMap(JsObject(_))
       }
-        .filter {
-          case (FPathElem(_, FPathElem(idOrName, _)), caseTraversal) =>
-            db
-              .roTransaction(implicit graph => customFieldSrv.get(EntityIdOrName(idOrName)).value(_.`type`).getOrFail("CustomField"))
-              .map {
-                case CustomFieldType.boolean => caseTraversal.customFields(EntityIdOrName(idOrName)).value(_.booleanValue)
-                case CustomFieldType.date    => caseTraversal.customFields(EntityIdOrName(idOrName)).value(_.dateValue)
-                case CustomFieldType.float   => caseTraversal.customFields(EntityIdOrName(idOrName)).value(_.floatValue)
-                case CustomFieldType.integer => caseTraversal.customFields(EntityIdOrName(idOrName)).value(_.integerValue)
-                case CustomFieldType.string  => caseTraversal.customFields(EntityIdOrName(idOrName)).value(_.stringValue)
-              }
-              .getOrElse(caseTraversal.constant2(null))
-          case (_, caseTraversal) => caseTraversal.constant2(null)
-        }
-        .converter {
-          case FPathElem(_, FPathElem(idOrName, _)) =>
-            db
-              .roTransaction { implicit graph =>
-                customFieldSrv.get(EntityIdOrName(idOrName)).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
+        .filter(FieldsParser.json) {
+          case (FPathElem(_, FPathElem(name, _)), caseTraversal, _, predicate) =>
+            predicate match {
+              case Right(predicate) => caseTraversal.customFieldFilter(customFieldSrv, EntityIdOrName(name), predicate)
+              case Left(true)       => caseTraversal.hasCustomField(customFieldSrv, EntityIdOrName(name))
+              case Left(false)      => caseTraversal.hasNotCustomField(customFieldSrv, EntityIdOrName(name))
+            }
+          case (_, caseTraversal, _, _) => caseTraversal.limit(0)
         }
         .custom {
-          case (FPathElem(_, FPathElem(idOrName, _)), value, vertex, _, graph, authContext) =>
+          case (FPathElem(_, FPathElem(idOrName, _)), value, vertex, graph, authContext) =>
             for {
               c <- caseSrv.get(vertex)(graph).getOrFail("Case")
               _ <- caseSrv.setOrCreateCustomField(c, EntityIdOrName(idOrName), Some(value), None)(graph, authContext)
             } yield Json.obj(s"customField.$idOrName" -> value)
-          case (FPathElem(_, FPathEmpty), values: JsObject, vertex, _, graph, authContext) =>
+          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(EntityIdOrName(n))(graph).map(cf => (cf, v, None)) }
@@ -354,22 +329,22 @@ class Properties @Inject() (
       .property("description", UMapping.string.optional)(_.field.updatable)
       .property("severity", UMapping.int.optional)(_.field.updatable)
       .property("tags", UMapping.string.set)(
-        _.select(_.tags.displayName)
-          .filter((_, cases) =>
-            cases
-              .tags
-              .graphMap[String, String, Converter.Identity[String]](
-                { v =>
-                  val namespace = UMapping.string.getProperty(v, "namespace")
-                  val predicate = UMapping.string.getProperty(v, "predicate")
-                  val value     = UMapping.string.optional.getProperty(v, "value")
-                  Tag(namespace, predicate, value, None, 0).toString
-                },
-                Converter.identity[String]
-              )
-          )
-          .converter(_ => Converter.identity[String])
-          .custom { (_, value, vertex, _, graph, authContext) =>
+        _.select(_.tags.displayName) // FIXME add filter
+//          .filter((_, cases) =>
+//            cases
+//              .tags
+//              .graphMap[String, String, Converter.Identity[String]](
+//                { v =>
+//                  val namespace = UMapping.string.getProperty(v, "namespace")
+//                  val predicate = UMapping.string.getProperty(v, "predicate")
+//                  val value     = UMapping.string.optional.getProperty(v, "value")
+//                  Tag(namespace, predicate, value, None, 0).toString
+//                },
+//                Converter.identity[String]
+//              )
+//          )
+//          .converter(_ => Converter.identity[String])
+          .custom { (_, value, vertex, graph, authContext) =>
             caseTemplateSrv
               .get(vertex)(graph)
               .getOrFail("CaseTemplate")
@@ -386,7 +361,7 @@ class Properties @Inject() (
         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) =>
+        case (FPathElem(_, FPathElem(name, _)), value, vertex, graph, authContext) =>
           for {
             c <- caseTemplateSrv.getOrFail(vertex)(graph)
             _ <- caseTemplateSrv.setOrCreateCustomField(c, name, Some(value), None)(graph, authContext)
@@ -419,7 +394,7 @@ class Properties @Inject() (
       .property("dueDate", UMapping.date.optional)(_.field.updatable)
       .property("group", UMapping.string)(_.field.updatable)
       .property("assignee", UMapping.string.optional)(_.select(_.assignee.value(_.login)).custom {
-        case (_, value, vertex, _, graph, authContext) =>
+        case (_, value, vertex, graph, authContext) =>
           taskSrv
             .get(vertex)(graph)
             .getOrFail("Task")
@@ -433,12 +408,9 @@ class Properties @Inject() (
             }
             .map(_ => Json.obj("assignee" -> value))
       })
-      .property("actionRequired", UMapping.boolean)(_
-        .authSelect((t, authContext) => {
-          t.actionRequired(authContext)
-        })
-        .readonly
-      )
+      .property("actionRequired", UMapping.boolean)(_.authSelect { (t, authContext) =>
+        t.actionRequired(authContext)
+      }.readonly)
       .build
 
   lazy val log: PublicProperties =
diff --git a/thehive/app/org/thp/thehive/models/Audit.scala b/thehive/app/org/thp/thehive/models/Audit.scala
index 38c636ddca..d2d8312af2 100644
--- a/thehive/app/org/thp/thehive/models/Audit.scala
+++ b/thehive/app/org/thp/thehive/models/Audit.scala
@@ -1,11 +1,10 @@
 package org.thp.thehive.models
 
 import java.util.Date
-
-import org.apache.tinkerpop.gremlin.structure.{Edge, Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.{Edge, Vertex}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
-import org.thp.scalligraph.traversal.Converter
+import org.thp.scalligraph.traversal.{Converter, Graph}
 import org.thp.scalligraph.{BuildEdgeEntity, BuildVertexEntity, EntityId}
 
 @BuildEdgeEntity[Audit, User]
@@ -111,7 +110,7 @@ object Audited {
         override def _createdAt: Date           = entity._createdAt
         override def _updatedAt: Option[Date]   = entity._updatedAt
       }
-    override def create(e: Audited, from: Vertex, to: Vertex)(implicit db: Database, graph: Graph): Edge = from.addEdge(label, to)
+    override def create(e: Audited, from: Vertex, to: Vertex)(implicit graph: Graph): Edge = from.addEdge(label, to)
   }
 }
 case class AuditContext()
@@ -142,7 +141,7 @@ object AuditContext extends HasModel {
         override def _createdAt: Date           = entity._createdAt
         override def _updatedAt: Option[Date]   = entity._updatedAt
       }
-    override def create(e: AuditContext, from: Vertex, to: Vertex)(implicit db: Database, graph: Graph): Edge =
+    override def create(e: AuditContext, from: Vertex, to: Vertex)(implicit graph: Graph): Edge =
       from.addEdge(label, to)
   }
 }
diff --git a/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala b/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala
deleted file mode 100644
index f9edf6ea0f..0000000000
--- a/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.thp.thehive.models
-
-import akka.actor.{Actor, ActorRef, ActorSystem, PoisonPill, Props}
-import akka.cluster.singleton.{ClusterSingletonManager, ClusterSingletonManagerSettings, ClusterSingletonProxy, ClusterSingletonProxySettings}
-import akka.pattern.ask
-import akka.util.Timeout
-import org.thp.scalligraph.janus.JanusDatabase
-import org.thp.scalligraph.models.Database
-import org.thp.thehive.ClusterSetup
-import org.thp.thehive.services.LocalUserSrv
-import play.api.{Configuration, Logger}
-
-import javax.inject.{Inject, Provider, Singleton}
-import scala.concurrent.duration.{DurationInt, FiniteDuration}
-import scala.concurrent.{Await, ExecutionContext}
-
-@Singleton
-class DatabaseProvider @Inject() (
-    configuration: Configuration,
-    database: Database,
-    theHiveSchema: TheHiveSchemaDefinition,
-    actorSystem: ActorSystem,
-    clusterSetup: ClusterSetup // this dependency is here to ensure that cluster setup is finished
-) extends Provider[Database] {
-
-  lazy val dbInitialisationTimeout: FiniteDuration = configuration.get[FiniteDuration]("db.initialisationTimeout")
-  lazy val schemaUpdaterActor: ActorRef = {
-    val singletonManager =
-      actorSystem.actorOf(
-        ClusterSingletonManager.props(
-          singletonProps = Props(classOf[SchemaUpdaterActor], theHiveSchema, database),
-          terminationMessage = PoisonPill,
-          settings = ClusterSingletonManagerSettings(actorSystem)
-        ),
-        name = "theHiveSchemaUpdaterSingletonManager"
-      )
-
-    actorSystem.actorOf(
-      ClusterSingletonProxy.props(
-        singletonManagerPath = singletonManager.path.toStringWithoutAddress,
-        settings = ClusterSingletonProxySettings(actorSystem)
-      ),
-      name = "theHiveSchemaUpdaterSingletonProxy"
-    )
-  }
-
-  def databaseInstance: String =
-    database match {
-      case jdb: JanusDatabase => jdb.instanceId
-      case _                  => ""
-    }
-
-  override def get(): Database = {
-    implicit val timeout: Timeout = Timeout(dbInitialisationTimeout)
-    Await.result(schemaUpdaterActor ? RequestDB(databaseInstance), timeout.duration) match {
-      case DBReady => database.asInstanceOf[Database]
-    }
-  }
-}
-
-sealed trait SchemaUpdaterMessage
-case class RequestDB(databaseInstanceId: String) extends SchemaUpdaterMessage
-case object DBReady                              extends SchemaUpdaterMessage
-case object Update                               extends SchemaUpdaterMessage
-
-class SchemaUpdaterActor @Inject() (theHiveSchema: TheHiveSchemaDefinition, database: Database) extends Actor {
-
-  lazy val logger: Logger = Logger(getClass)
-
-  implicit val ec: ExecutionContext      = context.dispatcher
-  var originalConnectionIds: Set[String] = Set.empty
-
-  def update(): Unit = {
-    theHiveSchema
-      .update(database)(LocalUserSrv.getSystemAuthContext)
-      .map(_ => logger.info("Database is up-to-date"))
-      .recover {
-        case error => logger.error(s"Database with TheHiveSchema schema update failure", error)
-      }
-    logger.info("Install eventual missing indexes")
-    database.addSchemaIndexes(theHiveSchema).recover {
-      case error => logger.error(s"Database with TheHiveSchema index update failure", error)
-    }
-    ()
-  }
-
-  override def preStart(): Unit = {
-    originalConnectionIds = database match {
-      case jdb: JanusDatabase => jdb.openInstances
-      case _                  => Set.empty
-    }
-    logger.debug(s"Database open instances are: ${originalConnectionIds.mkString(",")}")
-  }
-
-  def hasUnknownConnections(instanceIds: Set[String]): Boolean = (originalConnectionIds -- instanceIds).nonEmpty
-
-  def dropUnknownConnections(instanceIds: Set[String]): Unit =
-    database match {
-      case jdb: JanusDatabase => jdb.dropConnections((originalConnectionIds -- instanceIds).toSeq)
-      case _                  =>
-    }
-
-  override def receive: Receive = {
-    case RequestDB(instanceId) =>
-      val instanceIds = Set(instanceId)
-      if (hasUnknownConnections(instanceIds)) {
-        logger.info("Database has unknown connections, wait 5 seconds for full cluster initialisation")
-        context.system.scheduler.scheduleOnce(5.seconds, self, Update)
-        context.become(receive(instanceIds, Seq(sender)))
-      } else {
-        logger.info("Database is ready to be updated")
-        update()
-        sender ! DBReady
-        context.become(receive(instanceIds, Nil))
-      }
-
-      def receive(instanceIds: Set[String], waitingClients: Seq[ActorRef]): Receive = {
-        case RequestDB(instanceId) if waitingClients.nonEmpty =>
-          context.become(receive(instanceIds + instanceId, waitingClients :+ sender))
-        case RequestDB(_) =>
-          sender ! DBReady
-        case Update =>
-          logger.info("Drop unknown connections and update the database")
-          dropUnknownConnections(instanceIds)
-          update()
-          waitingClients.foreach(_ ! DBReady)
-          context.become(receive(instanceIds, Nil))
-      }
-  }
-}
diff --git a/thehive/app/org/thp/thehive/models/SchemaUpdaterSerializer.scala b/thehive/app/org/thp/thehive/models/SchemaUpdaterSerializer.scala
deleted file mode 100644
index 8a0ba3ea82..0000000000
--- a/thehive/app/org/thp/thehive/models/SchemaUpdaterSerializer.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.thp.thehive.models
-
-import akka.serialization.Serializer
-
-import java.io.NotSerializableException
-
-class SchemaUpdaterSerializer extends Serializer {
-  override def identifier: Int = 272437668
-
-  override def includeManifest: Boolean = false
-
-  override def toBinary(o: AnyRef): Array[Byte] =
-    o match {
-      case RequestDB(instanceId) => 0.toByte +: instanceId.getBytes
-      case DBReady               => Array(1)
-      case Update                => Array(2)
-      case _                     => throw new NotSerializableException
-    }
-
-  override def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): AnyRef =
-    bytes(0) match {
-      case 0 => RequestDB(new String(bytes.tail))
-      case 1 => DBReady
-      case 2 => Update
-      case _ => throw new NotSerializableException
-    }
-}
diff --git a/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala b/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
index da0fe21586..3e16940379 100644
--- a/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
+++ b/thehive/app/org/thp/thehive/models/TheHiveSchemaDefinition.scala
@@ -1,10 +1,8 @@
 package org.thp.thehive.models
 
 import java.lang.reflect.Modifier
-
 import javax.inject.{Inject, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.P
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality
 import org.janusgraph.core.schema.ConsistencyModifier
 import org.janusgraph.graphdb.types.TypeDefinitionCategory
@@ -14,6 +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.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import play.api.Logger
 
diff --git a/thehive/app/org/thp/thehive/services/AlertSrv.scala b/thehive/app/org/thp/thehive/services/AlertSrv.scala
index 0d7de34c4b..2f2e28be13 100644
--- a/thehive/app/org/thp/thehive/services/AlertSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AlertSrv.scala
@@ -1,13 +1,12 @@
 package org.thp.thehive.services
 
 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._
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, IdentityConverter, StepLabel, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, IdentityConverter, StepLabel, Traversal}
 import org.thp.scalligraph.{CreateError, EntityId, EntityIdOrName, RichOptionTry, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputCustomFieldValue
diff --git a/thehive/app/org/thp/thehive/services/AttachmentSrv.scala b/thehive/app/org/thp/thehive/services/AttachmentSrv.scala
index 77e39fcd62..dbded9f0fa 100644
--- a/thehive/app/org/thp/thehive/services/AttachmentSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AttachmentSrv.scala
@@ -4,13 +4,12 @@ import akka.NotUsed
 import akka.stream.scaladsl.{Source, StreamConverters}
 import akka.stream.{IOResult, Materializer}
 import akka.util.ByteString
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.NotFoundError
 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.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.utils.Hasher
 import org.thp.thehive.models.Attachment
diff --git a/thehive/app/org/thp/thehive/services/AuditSrv.scala b/thehive/app/org/thp/thehive/services/AuditSrv.scala
index da4cd7981e..dea8177165 100644
--- a/thehive/app/org/thp/thehive/services/AuditSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AuditSrv.scala
@@ -1,18 +1,18 @@
 package org.thp.thehive.services
 
 import java.util.{Map => JMap}
-
 import akka.actor.ActorRef
 import com.google.inject.name.Named
+
 import javax.inject.{Inject, Provider, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.Order
 import org.apache.tinkerpop.gremlin.structure.Transaction.Status
-import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Entity, _}
 import org.thp.scalligraph.services._
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, IdentityConverter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, IdentityConverter, Traversal}
 import org.thp.scalligraph.{EntityId, EntityIdOrName}
 import org.thp.thehive.models._
 import org.thp.thehive.services.AuditOps._
diff --git a/thehive/app/org/thp/thehive/services/CaseSrv.scala b/thehive/app/org/thp/thehive/services/CaseSrv.scala
index 291a1147af..4bd14077a7 100644
--- a/thehive/app/org/thp/thehive/services/CaseSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CaseSrv.scala
@@ -5,14 +5,14 @@ import akka.actor.ActorRef
 
 import javax.inject.{Inject, Named, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.{Order, P}
-import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, StepLabel, Traversal}
 import org.thp.scalligraph.{CreateError, EntityIdOrName, EntityName, RichOptionTry, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.dto.v1.InputCustomFieldValue
@@ -36,7 +36,6 @@ class CaseSrv @Inject() (
     profileSrv: ProfileSrv,
     shareSrv: ShareSrv,
     taskSrv: TaskSrv,
-    observableSrv: ObservableSrv,
     auditSrv: AuditSrv,
     resolutionStatusSrv: ResolutionStatusSrv,
     impactStatusSrv: ImpactStatusSrv,
@@ -113,7 +112,7 @@ class CaseSrv @Inject() (
       traversal: Traversal.V[Case],
       propertyUpdaters: Seq[PropertyUpdater]
   )(implicit graph: Graph, authContext: AuthContext): Try[(Traversal.V[Case], JsObject)] = {
-    val closeCase = PropertyUpdater(FPathElem("closeCase"), "") { (vertex, _, _, _) =>
+    val closeCase = PropertyUpdater(FPathElem("closeCase"), "") { (vertex, _, _) =>
       get(vertex)
         .tasks
         .or(_.has(_.status, TaskStatus.Waiting), _.has(_.status, TaskStatus.InProgress))
diff --git a/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala b/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
index 00e12667c3..a5c95caed9 100644
--- a/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CaseTemplateSrv.scala
@@ -1,17 +1,16 @@
 package org.thp.thehive.services
 
 import java.util.{Map => JMap}
-
 import akka.actor.ActorRef
+
 import javax.inject.{Inject, Named}
 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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, StepLabel, Traversal}
 import org.thp.scalligraph.{CreateError, EntityIdOrName, EntityName, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
diff --git a/thehive/app/org/thp/thehive/services/ConfigSrv.scala b/thehive/app/org/thp/thehive/services/ConfigSrv.scala
index f4d7683165..2ecc87e57e 100644
--- a/thehive/app/org/thp/thehive/services/ConfigSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ConfigSrv.scala
@@ -1,12 +1,11 @@
 package org.thp.thehive.services
 
 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.{EdgeSrv, VertexSrv}
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, StepLabel, Traversal}
 import org.thp.scalligraph.{EntityId, EntityIdOrName}
 import org.thp.thehive.models._
 import org.thp.thehive.services.ConfigOps._
diff --git a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
index 51be2623bc..a7b3ce8873 100644
--- a/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
+++ b/thehive/app/org/thp/thehive/services/CustomFieldSrv.scala
@@ -4,7 +4,7 @@ import java.util.{Map => JMap}
 
 import akka.actor.ActorRef
 import javax.inject.{Inject, Named, Singleton}
-import org.apache.tinkerpop.gremlin.structure.{Edge, Graph}
+import org.apache.tinkerpop.gremlin.structure.{Edge}
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
diff --git a/thehive/app/org/thp/thehive/services/DashboardSrv.scala b/thehive/app/org/thp/thehive/services/DashboardSrv.scala
index ddedda2344..04ad39bf00 100644
--- a/thehive/app/org/thp/thehive/services/DashboardSrv.scala
+++ b/thehive/app/org/thp/thehive/services/DashboardSrv.scala
@@ -1,16 +1,14 @@
 package org.thp.thehive.services
 
 import java.util.{List => JList, Map => JMap}
-
 import javax.inject.{Inject, Named, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.EntityIdOrName
 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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
 import org.thp.thehive.services.OrganisationOps._
diff --git a/thehive/app/org/thp/thehive/services/DataSrv.scala b/thehive/app/org/thp/thehive/services/DataSrv.scala
index 1471129e20..06f8d376f5 100644
--- a/thehive/app/org/thp/thehive/services/DataSrv.scala
+++ b/thehive/app/org/thp/thehive/services/DataSrv.scala
@@ -1,16 +1,16 @@
 package org.thp.thehive.services
 
 import java.lang.{Long => JLong}
-
 import akka.actor.ActorRef
+
 import javax.inject.{Inject, Named, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.P
-import org.apache.tinkerpop.gremlin.structure.{Graph, T}
+import org.apache.tinkerpop.gremlin.structure.T
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.services.{VertexSrv, _}
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.thehive.models._
 import org.thp.thehive.services.DataOps._
 
diff --git a/thehive/app/org/thp/thehive/services/FlowActor.scala b/thehive/app/org/thp/thehive/services/FlowActor.scala
index b92fa907ab..0991c6609a 100644
--- a/thehive/app/org/thp/thehive/services/FlowActor.scala
+++ b/thehive/app/org/thp/thehive/services/FlowActor.scala
@@ -1,12 +1,13 @@
 package org.thp.thehive.services
 
 import java.util.Date
-
 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 com.google.inject.Injector
+
 import javax.inject.{Inject, Provider, Singleton}
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy
+import org.apache.tinkerpop.gremlin.process.traversal.util.{TraversalExplanation, TraversalMetrics}
 import org.apache.tinkerpop.gremlin.process.traversal.{Order, P}
 import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.services.EventSrv
diff --git a/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala b/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
index 43b9ab1a33..de87fc5fc8 100644
--- a/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ImpactStatusSrv.scala
@@ -1,12 +1,12 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
+
 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.{IntegrityCheckOps, VertexSrv}
-import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{CreateError, EntityIdOrName}
 import org.thp.thehive.models.ImpactStatus
diff --git a/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala b/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
index e864d75cd2..4a25ed5b2e 100644
--- a/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
+++ b/thehive/app/org/thp/thehive/services/IntegrityCheckActor.scala
@@ -47,15 +47,16 @@ class IntegrityCheckActor() extends Actor {
   def check(name: String): Unit = integrityCheckMap.get(name).foreach(_.check())
 
   override def preStart(): Unit = {
-    implicit val authContext: AuthContext = LocalUserSrv.getSystemAuthContext
-    integrityCheckOps.foreach { integrityCheck =>
-      db.tryTransaction { implicit graph =>
-        Success(integrityCheck.initialCheck())
-      }
-    }
-    integrityCheckOps.foreach { integrityCheck =>
-      Success(integrityCheck.check())
-    }
+    // FIXME disabled to speed-up develop start
+//    implicit val authContext: AuthContext = LocalUserSrv.getSystemAuthContext
+//    integrityCheckOps.foreach { integrityCheck =>
+//      db.tryTransaction { implicit graph =>
+//        Success(integrityCheck.initialCheck())
+//      }
+//    }
+//    integrityCheckOps.foreach { integrityCheck =>
+//      Success(integrityCheck.check())
+//    }
   }
   override def receive: Receive = receive(Map.empty)
   def receive(states: Map[String, (Boolean, Cancellable)]): Receive = {
diff --git a/thehive/app/org/thp/thehive/services/KeyValueSrv.scala b/thehive/app/org/thp/thehive/services/KeyValueSrv.scala
index 4f88fb5a05..7bd5b9544b 100644
--- a/thehive/app/org/thp/thehive/services/KeyValueSrv.scala
+++ b/thehive/app/org/thp/thehive/services/KeyValueSrv.scala
@@ -1,10 +1,10 @@
 package org.thp.thehive.services
 
 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.traversal.Graph
 import org.thp.thehive.models.KeyValue
 
 import scala.util.Try
diff --git a/thehive/app/org/thp/thehive/services/LogSrv.scala b/thehive/app/org/thp/thehive/services/LogSrv.scala
index 801f2c82a0..665475e18f 100644
--- a/thehive/app/org/thp/thehive/services/LogSrv.scala
+++ b/thehive/app/org/thp/thehive/services/LogSrv.scala
@@ -1,6 +1,5 @@
 package org.thp.thehive.services
 
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.EntityIdOrName
 import org.thp.scalligraph.auth.{AuthContext, Permission}
 import org.thp.scalligraph.controllers.FFile
@@ -8,7 +7,7 @@ import org.thp.scalligraph.models.{Database, Entity}
 import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
 import org.thp.thehive.services.LogOps._
diff --git a/thehive/app/org/thp/thehive/services/ObservableSrv.scala b/thehive/app/org/thp/thehive/services/ObservableSrv.scala
index b95f40f7aa..a1ba3891f3 100644
--- a/thehive/app/org/thp/thehive/services/ObservableSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ObservableSrv.scala
@@ -1,17 +1,16 @@
 package org.thp.thehive.services
 
 import java.util.{Map => JMap}
-
 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.apache.tinkerpop.gremlin.structure.Vertex
 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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, StepLabel, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, StepLabel, Traversal}
 import org.thp.scalligraph.utils.Hash
 import org.thp.scalligraph.{EntityIdOrName, RichSeq}
 import org.thp.thehive.models._
diff --git a/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala b/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
index 1a3c2fff26..55830804dd 100644
--- a/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ObservableTypeSrv.scala
@@ -1,12 +1,12 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
+
 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.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{BadRequestError, CreateError, EntityIdOrName}
 import org.thp.thehive.models._
diff --git a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
index 6d4115acd8..dbcdd2f4ab 100644
--- a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
+++ b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
@@ -1,16 +1,15 @@
 package org.thp.thehive.services
 
 import java.util.{Map => JMap}
-
 import akka.actor.ActorRef
+
 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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.scalligraph.{BadRequestError, EntityId, EntityIdOrName, RichSeq}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
diff --git a/thehive/app/org/thp/thehive/services/PageSrv.scala b/thehive/app/org/thp/thehive/services/PageSrv.scala
index 4e28fbe934..d0799b230d 100644
--- a/thehive/app/org/thp/thehive/services/PageSrv.scala
+++ b/thehive/app/org/thp/thehive/services/PageSrv.scala
@@ -1,12 +1,11 @@
 package org.thp.thehive.services
 
 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.query.PropertyUpdater
 import org.thp.scalligraph.services.{EdgeSrv, VertexSrv}
-import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Organisation, OrganisationPage, Page}
 import org.thp.thehive.services.OrganisationOps._
diff --git a/thehive/app/org/thp/thehive/services/ProfileSrv.scala b/thehive/app/org/thp/thehive/services/ProfileSrv.scala
index e0941b7581..8acf62c77a 100644
--- a/thehive/app/org/thp/thehive/services/ProfileSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ProfileSrv.scala
@@ -1,13 +1,13 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
+
 import javax.inject.{Inject, Named, Provider, 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.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{BadRequestError, EntityIdOrName, EntityName}
 import org.thp.thehive.controllers.v1.Conversion._
diff --git a/thehive/app/org/thp/thehive/services/ReportTagSrv.scala b/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
index a22d578e3a..198c581164 100644
--- a/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ReportTagSrv.scala
@@ -1,12 +1,11 @@
 package org.thp.thehive.services
 
 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, VertexSrv}
-import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Observable, ObservableReportTag, ReportTag}
 import org.thp.thehive.services.ObservableOps._
diff --git a/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala b/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
index 02e8bbc873..4fee51ac77 100644
--- a/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ResolutionStatusSrv.scala
@@ -1,12 +1,12 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
+
 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.{IntegrityCheckOps, VertexSrv}
-import org.thp.scalligraph.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{CreateError, EntityIdOrName}
 import org.thp.thehive.models.ResolutionStatus
diff --git a/thehive/app/org/thp/thehive/services/RoleSrv.scala b/thehive/app/org/thp/thehive/services/RoleSrv.scala
index c4178722d2..fe07c936ee 100644
--- a/thehive/app/org/thp/thehive/services/RoleSrv.scala
+++ b/thehive/app/org/thp/thehive/services/RoleSrv.scala
@@ -1,11 +1,10 @@
 package org.thp.thehive.services
 
 import javax.inject.{Inject, Named, Singleton}
-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.traversal.Traversal
+import org.thp.scalligraph.traversal.{Graph, Traversal}
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models._
 import org.thp.thehive.services.RoleOps._
diff --git a/thehive/app/org/thp/thehive/services/ShareSrv.scala b/thehive/app/org/thp/thehive/services/ShareSrv.scala
index a385687ed3..49b523dd03 100644
--- a/thehive/app/org/thp/thehive/services/ShareSrv.scala
+++ b/thehive/app/org/thp/thehive/services/ShareSrv.scala
@@ -1,15 +1,14 @@
 package org.thp.thehive.services
 
 import java.util.{Map => JMap}
-
-import javax.inject.{Inject, Named, Provider, Singleton}
+import javax.inject.{Inject, Provider, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.P
-import org.apache.tinkerpop.gremlin.structure.{Graph, T}
+import org.apache.tinkerpop.gremlin.structure.T
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models._
 import org.thp.scalligraph.services._
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.scalligraph.{CreateError, EntityIdOrName}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
diff --git a/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala b/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala
index 94441d57ba..35ecf31076 100644
--- a/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TOTPAuthSrv.scala
@@ -2,15 +2,14 @@ package org.thp.thehive.services
 
 import java.net.URI
 import java.util.concurrent.TimeUnit
-
 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.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{AuthenticationError, EntityIdOrName, MultiFactorCodeRequired}
 import play.api.Configuration
diff --git a/thehive/app/org/thp/thehive/services/TagSrv.scala b/thehive/app/org/thp/thehive/services/TagSrv.scala
index 9620a7b3d0..a9313493a9 100644
--- a/thehive/app/org/thp/thehive/services/TagSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TagSrv.scala
@@ -1,14 +1,15 @@
 package org.thp.thehive.services
 
 import akka.actor.ActorRef
+
 import javax.inject.{Inject, Named, Singleton}
-import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.thehive.models.{AlertTag, CaseTag, ObservableTag, Tag}
 import org.thp.thehive.services.TagOps._
 
diff --git a/thehive/app/org/thp/thehive/services/TaskSrv.scala b/thehive/app/org/thp/thehive/services/TaskSrv.scala
index 5602d2e68a..6057da5c15 100644
--- a/thehive/app/org/thp/thehive/services/TaskSrv.scala
+++ b/thehive/app/org/thp/thehive/services/TaskSrv.scala
@@ -1,13 +1,12 @@
 package org.thp.thehive.services
 
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.EntityIdOrName
 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.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.thehive.models.{TaskStatus, _}
 import org.thp.thehive.services.OrganisationOps._
 import org.thp.thehive.services.ShareOps._
diff --git a/thehive/app/org/thp/thehive/services/UserSrv.scala b/thehive/app/org/thp/thehive/services/UserSrv.scala
index b236698813..49b71933cb 100644
--- a/thehive/app/org/thp/thehive/services/UserSrv.scala
+++ b/thehive/app/org/thp/thehive/services/UserSrv.scala
@@ -2,11 +2,11 @@ package org.thp.thehive.services
 
 import java.util.regex.Pattern
 import java.util.{List => JList, Map => JMap}
-
 import akka.actor.ActorRef
+
 import javax.inject.{Inject, Named, Singleton}
 import org.apache.tinkerpop.gremlin.process.traversal.Order
-import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.scalligraph.auth.{AuthContext, AuthContextImpl, Permission}
 import org.thp.scalligraph.controllers.FFile
 import org.thp.scalligraph.models._
@@ -14,7 +14,7 @@ import org.thp.scalligraph.query.PropertyUpdater
 import org.thp.scalligraph.services._
 import org.thp.scalligraph.traversal.Converter.CList
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, Traversal}
 import org.thp.scalligraph.{AuthorizationError, BadRequestError, EntityIdOrName, EntityName, InternalError, RichOptionTry}
 import org.thp.thehive.controllers.v1.Conversion._
 import org.thp.thehive.models._
@@ -177,7 +177,7 @@ object UserOps {
 
     def isNotLocked: Traversal.V[User] = traversal.has(_.locked, false)
 
-    def can(requiredPermission: Permission)(implicit authContext: AuthContext, db: Database): Traversal.V[User] =
+    def can(requiredPermission: Permission)(implicit authContext: AuthContext): Traversal.V[User] =
       traversal.filter(_.organisations(requiredPermission).get(authContext.organisation))
 
     def getByAPIKey(key: String): Traversal.V[User] = traversal.has(_.apikey, key).v[User]
@@ -187,9 +187,9 @@ object UserOps {
     protected def organisations0(requiredPermission: Permission): Traversal.V[Organisation] =
       role.filter(_.profile.has(_.permissions, requiredPermission)).organisation
 
-    def organisations(requiredPermission: Permission)(implicit db: Database): Traversal.V[Organisation] = {
+    def organisations(requiredPermission: Permission): Traversal.V[Organisation] = {
       val isInAdminOrganisation = traversal.clone().organisations0(requiredPermission).getByName(Organisation.administration.name).exists
-      if (isInAdminOrganisation) db.labelFilter("Organisation")(traversal.V()).v[Organisation]
+      if (isInAdminOrganisation) traversal.graph.V[Organisation]()
       else organisations0(requiredPermission)
     }
 
diff --git a/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala b/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala
index 390ba0fdaa..afa6052eb7 100644
--- a/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala
+++ b/thehive/app/org/thp/thehive/services/notification/NotificationActor.scala
@@ -2,10 +2,11 @@ package org.thp.thehive.services.notification
 
 import akka.actor.{Actor, ActorIdentity, Identify}
 import akka.util.Timeout
+
 import javax.inject.{Inject, Named}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.{Database, Entity, Schema}
 import org.thp.scalligraph.services.EventSrv
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.scalligraph.{BadConfigurationError, EntityId}
 import org.thp.thehive.models.{Audit, Organisation, User}
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 52ae69a9f8..44c327d252 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/AppendToFile.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/AppendToFile.scala
@@ -2,11 +2,10 @@ package org.thp.thehive.services.notification.notifiers
 
 import java.nio.charset.Charset
 import java.nio.file.{Files, Paths, StandardOpenOption}
-
 import javax.inject.{Inject, Singleton}
-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.scalligraph.traversal.Graph
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.Configuration
 
@@ -42,8 +41,8 @@ class AppendToFile(filename: String, template: String, charset: Charset, baseUrl
       `object`: Option[Entity],
       organisation: Organisation with Entity,
       user: Option[User with Entity]
-  )(
-      implicit graph: Graph
+  )(implicit
+      graph: Graph
   ): Future[Unit] =
     buildMessage(template, audit, context, `object`, user, baseUrl).fold(
       Future.failed[Unit],
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 e49c69be06..863ec1dbab 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Emailer.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Emailer.scala
@@ -1,9 +1,9 @@
 package org.thp.thehive.services.notification.notifiers
 
 import javax.inject.{Inject, Singleton}
-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.scalligraph.traversal.Graph
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.libs.mailer.{Email, MailerClient}
 import play.api.{Configuration, Logger}
@@ -54,8 +54,8 @@ class Emailer(
       `object`: Option[Entity],
       organisation: Organisation with Entity,
       user: Option[User with Entity]
-  )(
-      implicit graph: Graph
+  )(implicit
+      graph: Graph
   ): Future[Unit] =
     user.fold(Future.successful(logger.warn(s"Email can't be sent to an organisation"))) { u =>
       buildMessage(template, audit, context, `object`, user, baseUrl)
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 97b6309158..81e3de30b1 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Mattermost.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Mattermost.scala
@@ -1,11 +1,12 @@
 package org.thp.thehive.services.notification.notifiers
 
 import akka.stream.Materializer
+
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.client.{ProxyWS, ProxyWSConfig}
 import org.thp.scalligraph.models.{Entity, Schema}
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
+import org.thp.scalligraph.traversal.Graph
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.libs.json.{Json, Reads, Writes}
 import play.api.libs.ws.WSClient
@@ -69,13 +70,14 @@ class Mattermost(ws: WSClient, mattermostNotification: MattermostNotification, b
       `object`: Option[Entity],
       organisation: Organisation with Entity,
       user: Option[User with Entity]
-  )(
-      implicit graph: Graph
+  )(implicit
+      graph: Graph
   ): Future[Unit] =
     for {
       finalMessage <- Future.fromTry(buildMessage(mattermostNotification.text, audit, context, `object`, user, baseUrl))
-      _ <- ws
-        .url(mattermostNotification.url)
-        .post(Json.toJson(mattermostNotification.copy(text = finalMessage)))
+      _ <-
+        ws
+          .url(mattermostNotification.url)
+          .post(Json.toJson(mattermostNotification.copy(text = finalMessage)))
     } yield ()
 }
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 59f4cdb569..71a8a14229 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Notifier.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Notifier.scala
@@ -1,8 +1,8 @@
 package org.thp.thehive.services.notification.notifiers
 
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.BadConfigurationError
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.{ConfigLoader, Configuration}
 
@@ -19,8 +19,8 @@ trait Notifier {
       `object`: Option[Entity],
       organisation: Organisation with Entity,
       user: Option[User with Entity]
-  )(
-      implicit graph: Graph
+  )(implicit
+      graph: Graph
   ): Future[Unit]
 
 }
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 024d84b732..b5a69118ec 100644
--- a/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala
+++ b/thehive/app/org/thp/thehive/services/notification/notifiers/Webhook.scala
@@ -1,15 +1,15 @@
 package org.thp.thehive.services.notification.notifiers
 
 import java.util.{Date, Map => JMap}
-
 import akka.stream.Materializer
+
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.{Graph, Vertex}
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.thp.client.{ProxyWS, ProxyWSConfig}
 import org.thp.scalligraph.models.{Entity, UMapping}
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.traversal.{Converter, IdentityConverter, Traversal}
+import org.thp.scalligraph.traversal.{Converter, Graph, IdentityConverter, Traversal}
 import org.thp.scalligraph.{BadConfigurationError, EntityIdOrName}
 import org.thp.thehive.controllers.v0.AuditRenderer
 import org.thp.thehive.controllers.v0.Conversion.fromObjectType
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 484b530d52..756e5d3ff4 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/CaseCreated.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/CaseCreated.scala
@@ -1,8 +1,8 @@
 package org.thp.thehive.services.notification.triggers
 
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 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 7328a31e5f..ce9cf0c16a 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/FilteredEvent.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/FilteredEvent.scala
@@ -1,9 +1,10 @@
 package org.thp.thehive.services.notification.triggers
 
 import com.typesafe.config.ConfigRenderOptions
+
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.Configuration
 import play.api.libs.functional.syntax._
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 e728493570..c399a67971 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/GlobalTrigger.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/GlobalTrigger.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.services.notification.triggers
 
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.thehive.models.{Audit, Organisation, User}
 
 trait GlobalTrigger extends Trigger {
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 c98751d464..571a224d3a 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/LogInMyTask.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/LogInMyTask.scala
@@ -1,9 +1,9 @@
 package org.thp.thehive.services.notification.triggers
 
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.EntityId
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Audit, Organisation, User}
 import org.thp.thehive.services.LogOps._
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 1ff4598baa..6fae8960e0 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/TaskAssigned.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/TaskAssigned.scala
@@ -1,9 +1,9 @@
 package org.thp.thehive.services.notification.triggers
 
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.EntityId
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.traversal.TraversalOps._
 import org.thp.thehive.models.{Audit, Organisation, User}
 import org.thp.thehive.services.TaskOps._
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 2224dd846f..f47b660d02 100644
--- a/thehive/app/org/thp/thehive/services/notification/triggers/Trigger.scala
+++ b/thehive/app/org/thp/thehive/services/notification/triggers/Trigger.scala
@@ -1,8 +1,8 @@
 package org.thp.thehive.services.notification.triggers
 
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.thp.scalligraph.BadConfigurationError
 import org.thp.scalligraph.models.Entity
+import org.thp.scalligraph.traversal.Graph
 import org.thp.thehive.models.{Audit, Organisation, User}
 import play.api.{ConfigLoader, Configuration}
 
@@ -13,8 +13,8 @@ trait Trigger {
 
   def preFilter(audit: Audit with Entity, context: Option[Entity], organisation: Organisation with Entity): Boolean
 
-  def filter(audit: Audit with Entity, context: Option[Entity], organisation: Organisation with Entity, user: Option[User with Entity])(
-      implicit graph: Graph
+  def filter(audit: Audit with Entity, context: Option[Entity], organisation: Organisation with Entity, user: Option[User with Entity])(implicit
+      graph: Graph
   ): Boolean = user.fold(true)(!_.locked)
 
   override def toString: String = s"Trigger($name)"
diff --git a/thehive/app/org/thp/thehive/services/th3/Aggregation.scala b/thehive/app/org/thp/thehive/services/th3/Aggregation.scala
index 358d5a744b..74e4e1879e 100644
--- a/thehive/app/org/thp/thehive/services/th3/Aggregation.scala
+++ b/thehive/app/org/thp/thehive/services/th3/Aggregation.scala
@@ -148,7 +148,6 @@ object TH3Aggregation {
 
 case class AggSum(aggName: Option[String], fieldName: String) extends Aggregation(aggName.getOrElse(s"sum_$fieldName")) {
   override def getTraversal(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -171,7 +170,6 @@ case class AggSum(aggName: Option[String], fieldName: String) extends Aggregatio
 }
 case class AggAvg(aggName: Option[String], fieldName: String) extends Aggregation(aggName.getOrElse(s"sum_$fieldName")) {
   override def getTraversal(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -194,7 +192,6 @@ case class AggAvg(aggName: Option[String], fieldName: String) extends Aggregatio
 
 case class AggMin(aggName: Option[String], fieldName: String) extends Aggregation(aggName.getOrElse(s"min_$fieldName")) {
   override def getTraversal(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -217,7 +214,6 @@ case class AggMin(aggName: Option[String], fieldName: String) extends Aggregatio
 
 case class AggMax(aggName: Option[String], fieldName: String) extends Aggregation(aggName.getOrElse(s"max_$fieldName")) {
   override def getTraversal(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -240,7 +236,6 @@ case class AggMax(aggName: Option[String], fieldName: String) extends Aggregatio
 
 case class AggCount(aggName: Option[String]) extends Aggregation(aggName.getOrElse("count")) {
   override def getTraversal(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -264,7 +259,6 @@ case class FieldAggregation(
   lazy val logger: Logger = Logger(getClass)
 
   override def getTraversal(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -295,7 +289,7 @@ case class FieldAggregation(
         Traversal.UnkD,
         Traversal.UnkG
       ]]]) =>
-        s.by(t => agg.getTraversal(db, publicProperties, traversalType, t.unfold, authContext).castDomain[Output[_]])
+        s.by(t => agg.getTraversal(publicProperties, traversalType, t.unfold, authContext).castDomain[Output[_]])
     }
 
     sizedSortedAndGroupedVertex
@@ -365,7 +359,6 @@ case class TimeAggregation(
   def keyToDate(key: Long): Date = new Date(key)
 
   override def getTraversal(
-      db: Database,
       publicProperties: PublicProperties,
       traversalType: ru.Type,
       traversal: Traversal.Unk,
@@ -388,7 +381,7 @@ case class TimeAggregation(
         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[_]])
+        s.by(t => agg.getTraversal(publicProperties, traversalType, t.unfold, authContext).castDomain[Output[_]])
     }
 
     groupedVertex
diff --git a/thehive/conf/play/reference-overrides.conf b/thehive/conf/play/reference-overrides.conf
index afb748cb43..a4d40ea45d 100644
--- a/thehive/conf/play/reference-overrides.conf
+++ b/thehive/conf/play/reference-overrides.conf
@@ -22,7 +22,7 @@ akka.actor {
   serializers {
     stream = "org.thp.thehive.services.StreamSerializer"
     notification = "org.thp.thehive.services.notification.NotificationSerializer"
-    thehive-schema-updater = "org.thp.thehive.models.SchemaUpdaterSerializer"
+    //thehive-schema-updater = "org.thp.thehive.models.SchemaUpdaterSerializer"
     flow = "org.thp.thehive.services.FlowSerializer"
     integrity = "org.thp.thehive.services.IntegrityCheckSerializer"
   }
@@ -30,7 +30,7 @@ akka.actor {
   serialization-bindings {
     "org.thp.thehive.services.StreamMessage" = stream
     "org.thp.thehive.services.notification.NotificationMessage" = notification
-    "org.thp.thehive.models.SchemaUpdaterMessage" = thehive-schema-updater
+    //"org.thp.thehive.models.SchemaUpdaterMessage" = thehive-schema-updater
     "org.thp.thehive.services.FlowMessage" = flow
     "org.thp.thehive.services.IntegrityCheckMessage" = integrity
   }
diff --git a/thehive/test/org/thp/thehive/DatabaseBuilder.scala b/thehive/test/org/thp/thehive/DatabaseBuilder.scala
index 51767a822f..e8494eafe7 100644
--- a/thehive/test/org/thp/thehive/DatabaseBuilder.scala
+++ b/thehive/test/org/thp/thehive/DatabaseBuilder.scala
@@ -1,14 +1,13 @@
 package org.thp.thehive
 
 import java.io.File
-
 import javax.inject.{Inject, Singleton}
-import org.apache.tinkerpop.gremlin.structure.Graph
 import org.scalactic.Or
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.controllers._
 import org.thp.scalligraph.models.{Database, Entity, Schema}
 import org.thp.scalligraph.services.{EdgeSrv, GenIntegrityCheckOps, VertexSrv}
+import org.thp.scalligraph.traversal.Graph
 import org.thp.scalligraph.{EntityId, EntityName, RichOption}
 import org.thp.thehive.models._
 import org.thp.thehive.services._
diff --git a/thehive/test/org/thp/thehive/QueryTest.scala b/thehive/test/org/thp/thehive/QueryTest.scala
new file mode 100644
index 0000000000..f2e212cc16
--- /dev/null
+++ b/thehive/test/org/thp/thehive/QueryTest.scala
@@ -0,0 +1,3 @@
+package org.thp.thehive
+
+class QueryTest {}
diff --git a/thehive/test/org/thp/thehive/services/CaseSrvTest.scala b/thehive/test/org/thp/thehive/services/CaseSrvTest.scala
index fcf58ac2f8..936bfdb9fc 100644
--- a/thehive/test/org/thp/thehive/services/CaseSrvTest.scala
+++ b/thehive/test/org/thp/thehive/services/CaseSrvTest.scala
@@ -212,7 +212,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
     }
 
     "close a case properly" in testApp { app =>
-      val updates = Seq(PropertyUpdater(FPathElem("status"), CaseStatus.Resolved) { (vertex, _, _, _) =>
+      val updates = Seq(PropertyUpdater(FPathElem("status"), CaseStatus.Resolved) { (vertex, _, _) =>
         vertex.property("status", CaseStatus.Resolved)
         Success(Json.obj("status" -> CaseStatus.Resolved))
       })