More changes to support 1.0