Updates for v0.10