Updated for v2.8.0