Updated a little bit to use the template helper