Updated for v2.6.0