Update for v0.5