Initial work for multi-language support