Upgrading core to v2