Updated for v0.4.0