Complete refactor localization support