Update RF API + More armor