Locales PatternStrategy improvements