Improve twig support and descriptors