Updates for v1.2