Update for v1.1