Updated templates to reflect last commit changes