Added support for language variables