Added basic TF handling