Updates to v0.11