improved handling with localized models