Bundling all changes done on the plane

@qinweigong 
Would there be performance concern with so many string replace here?