Adding extra tempaltes and simplifying existing templates