Adding templates
Merging the changes