Added more to templates