Updated RF Api ( should work for old api too - at least temporary ).