Upgraded to support 4.1.x and 4.2 build