Changes for 2.7