Add auto detecting the country and state