Better i18n support and added new factory method.