Added C.Encounter and C.LTemplate tags