Updated for the upcoming 2.4 release