More changes for 2.0