Updated for v0.3.3