Different modifications to deals with i18n and profile