Updates for v0.7