Migrating from 2.x to v3.0