Language var handling update