CMake for tf_handler updated