Update to match v0.5