Add JSON struct tags so that this deserializes properly