Migrate to core v0.9.0