Added country code & number handling