Making necessary changes for v1.2