Update for v0.4