Updates for v0.11