Added country detection