Added support for geograohical location when deployed in production