diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c409a3fa0b3b6e2f2ed5d47cac533051e0c3512..8b00b6d5e759a5ee7f44a0d2b69333bf630d9e5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 # Define precision supported by CHAMELEON
 # -----------------------------------------
 set( RP_CHAMELEON_DICTIONNARY ${CMAKE_SOURCE_DIR}/cmake_modules/local_subs.py )
-set( RP_CHAMELEON_PRECISIONS  "s;d;c;z" )
+set( RP_CHAMELEON_PRECISIONS  "s;d;c;z;ds;zc" )
 include(RulesPrecisions)
 # Check that at least one option CHAMELEON_PREC_ is set to ON
 # count number of CHAMELEON_PREC_ sets to ON
diff --git a/coreblas/compute/CMakeLists.txt b/coreblas/compute/CMakeLists.txt
index dc2aac9e239f0d7136f548016105225de76a72c8..d4c8cb065d537cec4ee00355391a30f6a4b8afc5 100644
--- a/coreblas/compute/CMakeLists.txt
+++ b/coreblas/compute/CMakeLists.txt
@@ -116,10 +116,12 @@ endif()
 if ( CHAMELEON_NO_KERNELS )
   list( APPEND ZSRC
     core_ztile_empty.c
+    core_zctile_empty.c
     )
 else()
   list( APPEND ZSRC
     core_ztile.c
+    core_zctile.c
     )
 endif()
 
diff --git a/coreblas/include/CMakeLists.txt b/coreblas/include/CMakeLists.txt
index aea8f77b606d71323f230a718ed22e4a0273c364..acd970620f0b741447b597e00eafb4de3c1e5b03 100644
--- a/coreblas/include/CMakeLists.txt
+++ b/coreblas/include/CMakeLists.txt
@@ -33,6 +33,7 @@ set(ZHDR
   coreblas/coreblas_z.h
   coreblas/coreblas_zc.h
   coreblas/coreblas_ztile.h
+  coreblas/coreblas_zctile.h
 )
 if( CHAMELEON_USE_HMAT )
   list( APPEND ZHDR
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index dec860e8e112b70e2e40798ebc4feda3e16ab46c..37b34b2750e5523e2b731d3bde0814ab722715c6 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -30,6 +30,7 @@
 # List of codelets required by all runtimes
 # -----------------------------------------
 set(CODELETS_ZSRC
+    codelets/codelet_zlag2c.c
     codelets/codelet_dlag2z.c
     codelets/codelet_dzasum.c
     ##################
diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index cf460a8d1d0bb531b4b170975196ee5331589ac0..3863d96a0d834ea9517461c51f10fa0fa347427f 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -162,6 +162,7 @@ configure_file("include/chameleon_starpu.h.in"
 set(RUNTIME_HDRS_GENERATED "")
 set(ZHDR
   include/runtime_codelet_z.h
+  include/runtime_codelet_zc.h
   )
 
 precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
@@ -233,6 +234,7 @@ set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS
 set(RUNTIME_SRCS_GENERATED "")
 set(ZSRC
   codelets/codelet_zcallback.c
+  codelets/codelet_zccallback.c
   ${CODELETS_ZSRC}
   )
 
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index ae8d74f73579b4fe851cf31d558d2cb07108f0bc..3391dca0e688d0eb4c612a0174e1dde5bb96b3f7 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -130,6 +130,10 @@ set(ZSRC
 # -----------------------------------------------
 foreach(_precision ${CHAMELEON_PRECISION} )
 
+  if ( ${_precision} STREQUAL ds OR ${_precision} STREQUAL zc )
+    continue()
+  endif()
+
   precisions_rules_py(${_precision}SRC_GENERATED "${ZSRC}"
     PRECISIONS "${_precision}" )
 
diff --git a/testing/CTestLists.cmake b/testing/CTestLists.cmake
index 502add004a084acfc4fdbef08151bca551285c98..7c979a91710167fff8c41bd92d58a62804f7e5ec 100644
--- a/testing/CTestLists.cmake
+++ b/testing/CTestLists.cmake
@@ -21,6 +21,10 @@ endif()
 if (NOT CHAMELEON_SIMULATION)
 
   foreach(prec ${RP_CHAMELEON_PRECISIONS})
+    if ( ${prec} STREQUAL ds OR ${prec} STREQUAL zc )
+      continue()
+    endif()
+
     set (CMD ./chameleon_${prec}testing)
 
     #