Better lang handling