Improved and fixed twig reference