Updates for v0.04