Update for v0.8
Update for v0.8