Locale support moved to listener