Adding support for additional languages