adding TF support