Added more to the template