ENH support for all languages