Added USRF compatibility