Updated Templates to deal with double curly braces