Updates for v1.1