Updates for v0.07