Adding support for Localization and profile