Adding templates to master