Adding support for default language defined by the server