Improved multilang support (easier to update?)