Refactor + localization enable