updated template patterns to new format