Update for v0.2