Adding locale selection