Improve internationalisation support