add support for TF gateway