Updates to v0.5