Integrate new beta changes in template