adding variable export support