diff --git a/control/auxiliary.c b/control/auxiliary.c
index 5f90b85afc4a93d915ca8f2a9ae80830226341c2..86f081b0399a0f67eafb49436f4c579cd6bbfdb0 100644
--- a/control/auxiliary.c
+++ b/control/auxiliary.c
@@ -51,10 +51,12 @@ void chameleon_warning(const char *func_name, const char *msg_text)
     CHAM_context_t *chamctxt;
 
     chamctxt = chameleon_context_self();
-    if (chamctxt == NULL)
+    if (chamctxt == NULL) {
         chameleon_fatal_error("chameleon_warning", "CHAMELEON not initialized");
-    if (chamctxt->warnings_enabled)
+    }
+    if (chamctxt->warnings_enabled) {
         fprintf(stderr, "CHAMELEON WARNING: %s(): %s\n", func_name, msg_text);
+    }
 }
 
 /**
diff --git a/control/context.c b/control/context.c
index fa0dcd2502c795edde63b2a73153ae263db1b15b..6698189e803d29dcbcfac7400615dc38d8f74652 100644
--- a/control/context.c
+++ b/control/context.c
@@ -168,7 +168,7 @@ int CHAMELEON_Enable(int option)
     }
 
     /* Enable at the lower level if required */
-    RUNTIME_enable( option );
+    RUNTIME_enable( chamctxt->schedopt, option );
 
     return CHAMELEON_SUCCESS;
 }
@@ -231,7 +231,7 @@ int CHAMELEON_Disable(int option)
     }
 
     /* Disable at the lower level if required */
-    RUNTIME_disable( option );
+    RUNTIME_disable( chamctxt->schedopt, option );
 
     return CHAMELEON_SUCCESS;
 }
diff --git a/include/chameleon/runtime.h b/include/chameleon/runtime.h
index bbd7e80c659d8e4981950cf6c509adf116e3f865..2c844b4212415e0964c7d7c77a443fd54cdb98d4 100644
--- a/include/chameleon/runtime.h
+++ b/include/chameleon/runtime.h
@@ -58,21 +58,27 @@ RUNTIME_context_destroy( CHAM_context_t *ctxt );
  * @brief Enable a global option of the runtime.
  * @warning Should be called only by CHAMELEON_Enable()
  *
+ * @param[in] runtime_ctxt
+ *            Pointer to the runtime data structure
+ *
  * @param[in] option
  *            @arg CHAMELEON_PROFILING_MODE: start the profiling mode of the runtime.
  */
 void
-RUNTIME_enable( int option );
+RUNTIME_enable( void *runtime_ctxt, int option );
 
 /**
  * @brief Disable a global option of the runtime.
  * @warning Should be called only by CHAMELEON_Disable()
  *
+ * @param[in] runtime_ctxt
+ *            Pointer to the runtime data structure
+ *
  * @param[in] option
  *            @arg CHAMELEON_PROFILING_MODE: stop the profiling mode of the runtime.
  */
 void
-RUNTIME_disable( int option );
+RUNTIME_disable( void *runtime_ctxt, int option );
 
 /**
  * @}
diff --git a/runtime/openmp/control/runtime_context.c b/runtime/openmp/control/runtime_context.c
index f4777c74e2fc4e22cde4fcdb71f361ca7898ecd9..19dded3962ab770e84d887ae7f25cd12cc633c8e 100644
--- a/runtime/openmp/control/runtime_context.c
+++ b/runtime/openmp/control/runtime_context.c
@@ -42,18 +42,21 @@ void RUNTIME_context_destroy( CHAM_context_t *chamctxt )
 /**
  *
  */
-void RUNTIME_enable( int lever )
+void RUNTIME_enable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
-        case CHAMELEON_PROFILING_MODE:
-            fprintf(stderr, "Profiling is not available with OpenMP\n");
-            break;
-        case CHAMELEON_BOUND:
-            fprintf(stderr, "Bound computation is not available with OpenMP\n");
-            break;
-        default:
-            return;
+    case CHAMELEON_DAG:
+        fprintf(stderr, "DAG is not available with OpenMP\n");
+        break;
+    case CHAMELEON_PROFILING_MODE:
+        fprintf(stderr, "Profiling is not available with OpenMP\n");
+        break;
+    case CHAMELEON_BOUND:
+        fprintf(stderr, "Bound computation is not available with OpenMP\n");
+        break;
+    default:
+        return;
     }
     return;
 }
@@ -61,18 +64,21 @@ void RUNTIME_enable( int lever )
 /**
  *
  */
-void RUNTIME_disable( int lever )
+void RUNTIME_disable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
-        case CHAMELEON_PROFILING_MODE:
-            fprintf(stderr, "Profiling is not available with OpenMP\n");
-            break;
-        case CHAMELEON_BOUND:
-            fprintf(stderr, "Bound computation is not available with OpenMP\n");
-            break;
-        default:
-            return;
+    case CHAMELEON_DAG:
+        fprintf(stderr, "DAG is not available with OpenMP\n");
+        break;
+    case CHAMELEON_PROFILING_MODE:
+        fprintf(stderr, "Profiling is not available with OpenMP\n");
+        break;
+    case CHAMELEON_BOUND:
+        fprintf(stderr, "Bound computation is not available with OpenMP\n");
+        break;
+    default:
+        return;
     }
     return;
 }
diff --git a/runtime/parsec/control/runtime_context.c b/runtime/parsec/control/runtime_context.c
index 6762593839ed4144593b7e1c958ab61f9b249fb8..e75177411e0d736692bfc8077690359856e4c73e 100644
--- a/runtime/parsec/control/runtime_context.c
+++ b/runtime/parsec/control/runtime_context.c
@@ -42,11 +42,19 @@ void RUNTIME_context_destroy( CHAM_context_t *chamctxt )
 /**
  *
  */
-void RUNTIME_enable(int lever)
+void RUNTIME_enable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
+    case CHAMELEON_DAG:
+        fprintf(stderr, "DAG is not available with PaRSEC\n");
+        break;
     case CHAMELEON_PROFILING_MODE:
+        fprintf(stderr, "Profiling is not available with PaRSEC\n");
+        //parsec_profiling_start();
+        break;
+    case CHAMELEON_BOUND:
+        fprintf(stderr, "Bound computation is not available with Quark\n");
         break;
     default:
         return;
@@ -57,11 +65,19 @@ void RUNTIME_enable(int lever)
 /**
  *
  */
-void RUNTIME_disable(int lever)
+void RUNTIME_disable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
+    case CHAMELEON_DAG:
+        fprintf(stderr, "DAG is not available with PaRSEC\n");
+        break;
     case CHAMELEON_PROFILING_MODE:
+        fprintf(stderr, "Profiling is not available with PaRSEC\n");
+        //parsec_profiling_stop();
+        break;
+    case CHAMELEON_BOUND:
+        fprintf(stderr, "Bound computation is not available with PaRSEC\n");
         break;
     default:
         return;
diff --git a/runtime/quark/control/runtime_context.c b/runtime/quark/control/runtime_context.c
index e3e2cac3513c95d357c0cf8c7dab15c50dd5ffe5..93868c6fc1921f7f0a35c0801efbb65644bec1ef 100644
--- a/runtime/quark/control/runtime_context.c
+++ b/runtime/quark/control/runtime_context.c
@@ -42,18 +42,22 @@ void RUNTIME_context_destroy( CHAM_context_t *chamctxt )
 /**
  *
  */
-void RUNTIME_enable( int lever )
+void RUNTIME_enable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
-        case CHAMELEON_PROFILING_MODE:
-            fprintf(stderr, "Profiling is not available with Quark\n");
-            break;
-        case CHAMELEON_BOUND:
-            fprintf(stderr, "Bound computation is not available with Quark\n");
-            break;
-        default:
-            return;
+    case CHAMELEON_DAG:
+        QUARK_Barrier( runtime_ctxt );
+        QUARK_DOT_DAG_Enable( runtime_ctxt, 1 );
+        break;
+    case CHAMELEON_PROFILING_MODE:
+        fprintf(stderr, "Profiling is not available with Quark\n");
+        break;
+    case CHAMELEON_BOUND:
+        fprintf(stderr, "Bound computation is not available with Quark\n");
+        break;
+    default:
+        return;
     }
     return;
 }
@@ -61,18 +65,22 @@ void RUNTIME_enable( int lever )
 /**
  *
  */
-void RUNTIME_disable( int lever )
+void RUNTIME_disable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
-        case CHAMELEON_PROFILING_MODE:
-            fprintf(stderr, "Profiling is not available with Quark\n");
-            break;
-        case CHAMELEON_BOUND:
-            fprintf(stderr, "Bound computation is not available with Quark\n");
-            break;
-        default:
-            return;
+    case CHAMELEON_DAG:
+        QUARK_Barrier( runtime_ctxt );
+        QUARK_DOT_DAG_Enable( runtime_ctxt, 0 );
+        break;
+    case CHAMELEON_PROFILING_MODE:
+        fprintf(stderr, "Profiling is not available with Quark\n");
+        break;
+    case CHAMELEON_BOUND:
+        fprintf(stderr, "Bound computation is not available with Quark\n");
+        break;
+    default:
+        return;
     }
     return;
 }
diff --git a/runtime/starpu/control/runtime_context.c b/runtime/starpu/control/runtime_context.c
index 71272e934c3f4d87cf400f556c6fa86bf33413fe..2bf597b24c4d2f2a1a8f5003f6a1a5e6761c5de5 100644
--- a/runtime/starpu/control/runtime_context.c
+++ b/runtime/starpu/control/runtime_context.c
@@ -69,18 +69,21 @@ void RUNTIME_context_destroy( CHAM_context_t *chamctxt )
 /**
  *
  */
-void RUNTIME_enable( int lever )
+void RUNTIME_enable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
-        case CHAMELEON_PROFILING_MODE:
-            starpu_profiling_status_set(STARPU_PROFILING_ENABLE);
-            break;
-        case CHAMELEON_BOUND:
-            starpu_bound_start(0, 0);
-            break;
-        default:
-            return;
+    case CHAMELEON_DAG:
+        fprintf(stderr, "StarPU is providing DAG generation through tracing support (CHAMELEON_PROFILING_MODE)\n");
+        break;
+    case CHAMELEON_PROFILING_MODE:
+        starpu_profiling_status_set(STARPU_PROFILING_ENABLE);
+        break;
+    case CHAMELEON_BOUND:
+        starpu_bound_start(0, 0);
+        break;
+    default:
+        return;
     }
     return;
 }
@@ -88,18 +91,21 @@ void RUNTIME_enable( int lever )
 /**
  *
  */
-void RUNTIME_disable( int lever )
+void RUNTIME_disable( void *runtime_ctxt, int lever )
 {
     switch (lever)
     {
-        case CHAMELEON_PROFILING_MODE:
-            starpu_profiling_status_set(STARPU_PROFILING_DISABLE);
-            break;
-        case CHAMELEON_BOUND:
-            starpu_bound_stop();
-            break;
-        default:
-            return;
+    case CHAMELEON_DAG:
+        fprintf(stderr, "StarPU is providing DAG generation through tracing support (CHAMELEON_PROFILING_MODE)\n");
+        break;
+    case CHAMELEON_PROFILING_MODE:
+        starpu_profiling_status_set(STARPU_PROFILING_DISABLE);
+        break;
+    case CHAMELEON_BOUND:
+        starpu_bound_stop();
+        break;
+    default:
+        return;
     }
     return;
 }