Update for v2.5.0