changes in map & i18n