More changes for V2.2.0