diff --git a/semantic/shared/src/main/scala/chester/tyck/ElaboraterFunction.scala b/semantic/shared/src/main/scala/chester/tyck/ElaboraterFunction.scala
index adda393f..144e4405 100644
--- a/semantic/shared/src/main/scala/chester/tyck/ElaboraterFunction.scala
+++ b/semantic/shared/src/main/scala/chester/tyck/ElaboraterFunction.scala
@@ -6,7 +6,7 @@ import chester.tyck.api.SemanticCollector
 import chester.error.*
 import chester.uniqid.*
 
-trait ElaboraterFunction extends ProvideCtx with Elaborater {
+trait ElaboraterFunction { this: ElaboraterBase & ElaboraterCommon =>
   def elabFunction(
       expr: FunctionExpr,
       ty: CellId[Term],
@@ -19,7 +19,7 @@ trait ElaboraterFunction extends ProvideCtx with Elaborater {
   ): Term
 }
 
-trait ProvideElaboraterFunction extends ElaboraterFunction {
+trait ProvideElaboraterFunction extends ElaboraterFunction { this: Elaborater & ElaboraterBase & ElaboraterCommon =>
   // Flag to enable or disable termination checking
   val terminationCheckEnabled: Boolean = true // Set to false to disable termination checking