Update for v0.13