Migrating from version 2 to 3