Updated for v0.9.0