Updated for 2.6.0+