Added country code and changed long to lng