Modified similar things (added i18n support)