Making the template more dynamic