MEDIUM / Refactor localization management