Multi-language support and more changes