More changes for the 2.0 release