Major improvements to Twig Extensions