Migrate to v0.6