Add eval/XS support