Updates for v0.4