Make country field optional