Add RF API and some other stuff