Move country field to Country model and provide db migration