Improve Lang class