In the validator: add country code & number handling