Add support for more languages