Updated for v0.8.0
Updated for v0.8.0