Improved the twig loader