Migration to v0.7