RF v8 compatibility