Supporting more languages