Updated for v0.6.0
Updated for v0.6.0