Update for v0.7