Updated to reflect v2.4.0 of the class.