Updated for v0.8.0