Support for RBX >= 2.1.0