Add beta code for version 2