Updates to match changes to master Template