Updated locale processing