Changes for Twig