Updated changes for v1.2