Updates for v1.0