More work to custom TF helper objects