More changes related to 1.0.0 bump