Add more language modes support