Added twig templating