Updated locale support