Updated for v0.10.0