Adding support for extra languages