Adding History And i18n code