Changed templates and created helpers