Handle unsafe vars inside or/and
Add missing helpers file