Changes for 2.0.0