Update for v0.6