Adding support 1.2.x
Adding support 1.2.x