Preparing for switch to v2