Improve domain localization