Added more templates