Refactor JSON Datastore so that we don't add duplicate entries

There was an issue where we would update a bin and this resulted in
a new entry being added instead of simply updating the pre-existing
object.