improving lang-support