More changes for 1.0