Refactoring and corrections about language support.