Updated to work with Beta verison, but repo is breaking the build.