Added missing tempalte tags