Added support for RFRs. Currently untested!!!!