Completed rb2 compatibility module