Updated for v0.7.0
Updated for v0.7.0