Refectoring for 2.2.0-RELEASE