Updates for v0.5