Updated to build on latest beta