Changes for v1.0