Use the new locale handler