Update for v0.6~exp