Improve management of languages/syntax