diff --git a/lib/geocoder/geocodiogeocoder.js b/lib/geocoder/geocodiogeocoder.js
index 26395cd..960dd2a 100644
--- a/lib/geocoder/geocodiogeocoder.js
+++ b/lib/geocoder/geocodiogeocoder.js
@@ -60,14 +60,15 @@ GeocodioGeocoder.prototype._formatResult = function (result) {
   return {
     latitude: result.location.lat,
     longitude: result.location.lng,
-    country: result.address_components.country,
+    country: null,
+    countryCode: result.address_components.country,
     formattedAddress: result.formatted_address,
     city: result.address_components.city,
-    state: result.address_components.state,
+    state: null,
+    stateCode: result.address_components.state,
     zipcode: result.address_components.zip,
     streetName: result.address_components.formatted_street,
     streetNumber: result.address_components.number,
-    countryCode: null,
     extra: {
       confidence: accuracy || 0
     }