Some changes and upgrade of RF api