Working on country detection