Add support for TFR scenarios