Added support for more language modes