Replicating changes for 1.x version