Create TFQ compatibility for testing/production use