Changes for 2.0