Updates for v1.07