Updated RF API (no functional change)