Add country field to Address