Added stuff to templates