Support RBX 2.1.1 and newer