Updates for 2.5