diff --git a/samples/localdiscovery/buzz.json b/samples/localdiscovery/buzz.json
index 083d086..cd121a2 100644
--- a/samples/localdiscovery/buzz.json
+++ b/samples/localdiscovery/buzz.json
@@ -1,1427 +1,3725 @@
 {
+ "kind": "discovery#restDescription",
+ "id": "buzz:v1",
  "name": "buzz",
  "version": "v1",
- "description": "Buzz APIs for Buzz Posts, etc.",
- "restBasePath": "/buzz/v1/",
- "rpcPath": "/rpc",
+ "title": "Buzz API",
+ "description": "Lets you share updates, photos, videos, and more with your friends around the world",
+ "icons": {
+  "x16": "http://www.google.com/images/icons/product/buzz-16.png",
+  "x32": "http://www.google.com/images/icons/product/buzz-32.png"
+ },
+ "documentationLink": "http://code.google.com/apis/buzz/v1/using_rest.html",
+ "labels": [
+  "labs"
+ ],
+ "protocol": "rest",
+ "basePath": "/buzz/v1/",
+ "auth": {
+  "oauth2": {
+   "scopes": {
+    "https://www.googleapis.com/auth/buzz": {
+     "description": "Manage your Buzz activity and address book"
+    },
+    "https://www.googleapis.com/auth/buzz.readonly": {
+     "description": "View your Buzz activity and address book"
+    },
+    "https://www.googleapis.com/auth/picasa": {
+     "description": "Manage your photos and videos"
+    }
+   }
+  }
+ },
+ "features": [
+  "dataWrapper"
+ ],
+ "schemas": {
+  "Activity": {
+   "id": "Activity",
+   "type": "object",
+   "properties": {
+    "actor": {
+     "type": "object",
+     "properties": {
+      "id": {
+       "type": "any"
+      },
+      "name": {
+       "type": "any"
+      },
+      "profileUrl": {
+       "type": "any"
+      },
+      "thumbnailUrl": {
+       "type": "any"
+      }
+     }
+    },
+    "address": {
+     "type": "any"
+    },
+    "annotation": {
+     "type": "any"
+    },
+    "categories": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "label": {
+        "type": "any"
+       },
+       "schema": {
+        "type": "any"
+       },
+       "term": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "crosspostSource": {
+     "type": "any"
+    },
+    "detectedlLang": {
+     "type": "any"
+    },
+    "geocode": {
+     "type": "any"
+    },
+    "id": {
+     "type": "any"
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#activity"
+    },
+    "links": {
+     "type": "object",
+     "properties": {
+      "liked": {
+       "type": "array",
+       "items": {
+        "type": "object",
+        "properties": {
+         "count": {
+          "type": "integer"
+         },
+         "href": {
+          "type": "any"
+         },
+         "type": {
+          "type": "any"
+         }
+        }
+       }
+      }
+     },
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "type": "object",
+       "properties": {
+        "count": {
+         "type": "any"
+        },
+        "height": {
+         "type": "any"
+        },
+        "href": {
+         "type": "any"
+        },
+        "title": {
+         "type": "any"
+        },
+        "type": {
+         "type": "any"
+        },
+        "updated": {
+         "type": "string"
+        },
+        "width": {
+         "type": "any"
+        }
+       }
+      }
+     }
+    },
+    "object": {
+     "type": "object",
+     "properties": {
+      "actor": {
+       "type": "object",
+       "properties": {
+        "id": {
+         "type": "any"
+        },
+        "name": {
+         "type": "any"
+        },
+        "profileUrl": {
+         "type": "any"
+        },
+        "thumbnailUrl": {
+         "type": "any"
+        }
+       }
+      },
+      "attachments": {
+       "type": "array",
+       "items": {
+        "type": "object",
+        "properties": {
+         "content": {
+          "type": "any"
+         },
+         "id": {
+          "type": "any"
+         },
+         "links": {
+          "type": "object",
+          "additionalProperties": {
+           "type": "array",
+           "items": {
+            "type": "object",
+            "properties": {
+             "count": {
+              "type": "any"
+             },
+             "height": {
+              "type": "any"
+             },
+             "href": {
+              "type": "any"
+             },
+             "title": {
+              "type": "any"
+             },
+             "type": {
+              "type": "any"
+             },
+             "updated": {
+              "type": "string"
+             },
+             "width": {
+              "type": "any"
+             }
+            }
+           }
+          }
+         },
+         "title": {
+          "type": "any"
+         },
+         "type": {
+          "type": "string"
+         }
+        }
+       }
+      },
+      "comments": {
+       "type": "array",
+       "items": {
+        "$ref": "Comment"
+       }
+      },
+      "content": {
+       "type": "any"
+      },
+      "detectedlLang": {
+       "type": "any"
+      },
+      "id": {
+       "type": "any"
+      },
+      "liked": {
+       "type": "array",
+       "items": {
+        "$ref": "Person"
+       }
+      },
+      "links": {
+       "type": "object",
+       "additionalProperties": {
+        "type": "array",
+        "items": {
+         "type": "object",
+         "properties": {
+          "href": {
+           "type": "any"
+          },
+          "type": {
+           "type": "any"
+          }
+         }
+        }
+       }
+      },
+      "originalContent": {
+       "type": "any"
+      },
+      "shareOriginal": {
+       "$ref": "Activity"
+      },
+      "targetLang": {
+       "type": "any"
+      },
+      "type": {
+       "type": "string"
+      },
+      "untranslatedContent": {
+       "type": "any"
+      }
+     }
+    },
+    "placeId": {
+     "type": "any"
+    },
+    "placeName": {
+     "type": "any"
+    },
+    "placeholder": {
+     "type": "any"
+    },
+    "published": {
+     "type": "string"
+    },
+    "radius": {
+     "type": "any"
+    },
+    "source": {
+     "type": "object",
+     "properties": {
+      "title": {
+       "type": "any"
+      }
+     }
+    },
+    "targetLang": {
+     "type": "any"
+    },
+    "title": {
+     "type": "any"
+    },
+    "untranslatedTitle": {
+     "type": "any"
+    },
+    "updated": {
+     "type": "string"
+    },
+    "verbs": {
+     "type": "array",
+     "items": {
+      "type": "string"
+     }
+    },
+    "visibility": {
+     "type": "object",
+     "properties": {
+      "entries": {
+       "type": "array",
+       "items": {
+        "type": "object",
+        "properties": {
+         "id": {
+          "type": "any"
+         },
+         "title": {
+          "type": "any"
+         }
+        }
+       }
+      }
+     }
+    }
+   }
+  },
+  "ActivityFeed": {
+   "id": "ActivityFeed",
+   "type": "object",
+   "properties": {
+    "id": {
+     "type": "any"
+    },
+    "items": {
+     "type": "array",
+     "items": {
+      "$ref": "Activity"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#activityFeed"
+    },
+    "links": {
+     "type": "object",
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "type": "object",
+       "properties": {
+        "count": {
+         "type": "any"
+        },
+        "height": {
+         "type": "any"
+        },
+        "href": {
+         "type": "any"
+        },
+        "title": {
+         "type": "any"
+        },
+        "type": {
+         "type": "any"
+        },
+        "updated": {
+         "type": "string"
+        },
+        "width": {
+         "type": "any"
+        }
+       }
+      }
+     }
+    },
+    "title": {
+     "type": "any"
+    },
+    "updated": {
+     "type": "string"
+    }
+   }
+  },
+  "Album": {
+   "id": "Album",
+   "type": "object",
+   "properties": {
+    "created": {
+     "type": "string"
+    },
+    "description": {
+     "type": "string"
+    },
+    "firstPhotoId": {
+     "type": "integer"
+    },
+    "id": {
+     "type": "integer"
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#album"
+    },
+    "lastModified": {
+     "type": "string"
+    },
+    "links": {
+     "type": "object",
+     "properties": {
+      "alternate": {
+       "$ref": "Link"
+      },
+      "enclosure": {
+       "$ref": "Link"
+      }
+     }
+    },
+    "owner": {
+     "type": "object",
+     "properties": {
+      "id": {
+       "type": "string"
+      },
+      "name": {
+       "type": "string"
+      },
+      "profileUrl": {
+       "type": "string"
+      },
+      "thumbnailUrl": {
+       "type": "string"
+      }
+     }
+    },
+    "tags": {
+     "type": "array",
+     "items": {
+      "type": "string"
+     }
+    },
+    "title": {
+     "type": "string"
+    },
+    "version": {
+     "type": "integer"
+    }
+   }
+  },
+  "AlbumLite": {
+   "id": "AlbumLite",
+   "type": "object",
+   "properties": {
+    "collection": {
+     "type": "object",
+     "properties": {
+      "album": {
+       "type": "any"
+      },
+      "albumId": {
+       "type": "any"
+      },
+      "photo": {
+       "type": "object",
+       "properties": {
+        "photoUrl": {
+         "type": "any"
+        }
+       }
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#albumLite"
+    }
+   }
+  },
+  "AlbumsFeed": {
+   "id": "AlbumsFeed",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "items": {
+      "$ref": "Album"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#albumsFeed"
+    }
+   }
+  },
+  "ChiliPhotosResourceJson": {
+   "id": "ChiliPhotosResourceJson",
+   "type": "object",
+   "properties": {
+    "album": {
+     "type": "object",
+     "properties": {
+      "id": {
+       "type": "integer"
+      },
+      "page_link": {
+       "$ref": "Link"
+      }
+     }
+    },
+    "created": {
+     "type": "string"
+    },
+    "description": {
+     "type": "string"
+    },
+    "fileSize": {
+     "type": "integer"
+    },
+    "id": {
+     "type": "integer"
+    },
+    "kind": {
+     "type": "string"
+    },
+    "lastModified": {
+     "type": "string"
+    },
+    "links": {
+     "type": "object",
+     "properties": {
+      "alternate": {
+       "type": "array",
+       "items": {
+        "$ref": "Link"
+       }
+      }
+     },
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "$ref": "Link"
+      }
+     }
+    },
+    "owner": {
+     "type": "object",
+     "properties": {
+      "id": {
+       "type": "string"
+      },
+      "name": {
+       "type": "string"
+      },
+      "profileUrl": {
+       "type": "string"
+      },
+      "thumbnailUrl": {
+       "type": "string"
+      }
+     }
+    },
+    "timestamp": {
+     "type": "number"
+    },
+    "title": {
+     "type": "string"
+    },
+    "version": {
+     "type": "integer"
+    },
+    "video": {
+     "$ref": "Video"
+    }
+   }
+  },
+  "Comment": {
+   "id": "Comment",
+   "type": "object",
+   "properties": {
+    "actor": {
+     "type": "object",
+     "properties": {
+      "id": {
+       "type": "any"
+      },
+      "name": {
+       "type": "any"
+      },
+      "profileUrl": {
+       "type": "any"
+      },
+      "thumbnailUrl": {
+       "type": "any"
+      }
+     }
+    },
+    "content": {
+     "type": "any"
+    },
+    "detectedLang": {
+     "type": "any"
+    },
+    "id": {
+     "type": "any"
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#comment"
+    },
+    "links": {
+     "type": "object",
+     "properties": {
+      "inReplyTo": {
+       "type": "array",
+       "items": {
+        "type": "object",
+        "properties": {
+         "href": {
+          "type": "any"
+         },
+         "ref": {
+          "type": "any"
+         },
+         "source": {
+          "type": "any"
+         }
+        }
+       }
+      }
+     },
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "type": "object",
+       "properties": {
+        "count": {
+         "type": "any"
+        },
+        "height": {
+         "type": "any"
+        },
+        "href": {
+         "type": "any"
+        },
+        "title": {
+         "type": "any"
+        },
+        "type": {
+         "type": "any"
+        },
+        "updated": {
+         "type": "string"
+        },
+        "width": {
+         "type": "any"
+        }
+       }
+      }
+     }
+    },
+    "originalContent": {
+     "type": "any"
+    },
+    "placeholder": {
+     "type": "any"
+    },
+    "published": {
+     "type": "string"
+    },
+    "targetLang": {
+     "type": "any"
+    },
+    "untranslatedContent": {
+     "type": "any"
+    },
+    "updated": {
+     "type": "string"
+    }
+   }
+  },
+  "CommentFeed": {
+   "id": "CommentFeed",
+   "type": "object",
+   "properties": {
+    "id": {
+     "type": "any"
+    },
+    "items": {
+     "type": "array",
+     "items": {
+      "$ref": "Comment"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#commentFeed"
+    },
+    "links": {
+     "type": "object",
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "type": "object",
+       "properties": {
+        "count": {
+         "type": "any"
+        },
+        "height": {
+         "type": "any"
+        },
+        "href": {
+         "type": "any"
+        },
+        "title": {
+         "type": "any"
+        },
+        "type": {
+         "type": "any"
+        },
+        "updated": {
+         "type": "string"
+        },
+        "width": {
+         "type": "any"
+        }
+       }
+      }
+     }
+    },
+    "title": {
+     "type": "any"
+    },
+    "updated": {
+     "type": "string"
+    }
+   }
+  },
+  "CountFeed": {
+   "id": "CountFeed",
+   "type": "object",
+   "properties": {
+    "counts": {
+     "type": "object",
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "type": "object",
+       "properties": {
+        "count": {
+         "type": "any"
+        },
+        "timestamp": {
+         "type": "string"
+        }
+       }
+      }
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#countFeed"
+    }
+   }
+  },
+  "Group": {
+   "id": "Group",
+   "type": "object",
+   "properties": {
+    "id": {
+     "type": "any"
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#group"
+    },
+    "links": {
+     "type": "object",
+     "properties": {
+      "self": {
+       "type": "array",
+       "items": {
+        "type": "object",
+        "properties": {
+         "href": {
+          "type": "any"
+         },
+         "type": {
+          "type": "string",
+          "default": "application/json"
+         }
+        }
+       }
+      }
+     }
+    },
+    "memberCount": {
+     "type": "any"
+    },
+    "title": {
+     "type": "any"
+    }
+   }
+  },
+  "GroupFeed": {
+   "id": "GroupFeed",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "items": {
+      "$ref": "Group"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#groupFeed"
+    },
+    "links": {
+     "type": "object",
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "type": "object",
+       "properties": {
+        "count": {
+         "type": "any"
+        },
+        "height": {
+         "type": "any"
+        },
+        "href": {
+         "type": "any"
+        },
+        "title": {
+         "type": "any"
+        },
+        "type": {
+         "type": "any"
+        },
+        "updated": {
+         "type": "string"
+        },
+        "width": {
+         "type": "any"
+        }
+       }
+      }
+     }
+    }
+   }
+  },
+  "Link": {
+   "id": "Link",
+   "type": "object",
+   "properties": {
+    "count": {
+     "type": "integer"
+    },
+    "height": {
+     "type": "integer"
+    },
+    "href": {
+     "type": "string"
+    },
+    "title": {
+     "type": "string"
+    },
+    "type": {
+     "type": "string"
+    },
+    "updated": {
+     "type": "string"
+    },
+    "width": {
+     "type": "integer"
+    }
+   }
+  },
+  "PeopleFeed": {
+   "id": "PeopleFeed",
+   "type": "object",
+   "properties": {
+    "entry": {
+     "type": "array",
+     "items": {
+      "$ref": "Person"
+     }
+    },
+    "itemsPerPage": {
+     "type": "any"
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#peopleFeed"
+    },
+    "startIndex": {
+     "type": "any"
+    },
+    "totalResults": {
+     "type": "any"
+    }
+   }
+  },
+  "Person": {
+   "id": "Person",
+   "type": "object",
+   "properties": {
+    "aboutMe": {
+     "type": "any"
+    },
+    "accounts": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "domain": {
+        "type": "any"
+       },
+       "userid": {
+        "type": "any"
+       },
+       "username": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "activities": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "addresses": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "country": {
+        "type": "any"
+       },
+       "formatted": {
+        "type": "any"
+       },
+       "locality": {
+        "type": "any"
+       },
+       "postalCode": {
+        "type": "any"
+       },
+       "primary": {
+        "type": "any"
+       },
+       "region": {
+        "type": "any"
+       },
+       "streetAddress": {
+        "type": "any"
+       },
+       "type": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "anniversary": {
+     "type": "any"
+    },
+    "birthday": {
+     "type": "any"
+    },
+    "bodyType": {
+     "type": "any"
+    },
+    "books": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "cars": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "children": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "connected": {
+     "type": "any"
+    },
+    "currentLocation": {
+     "type": "any"
+    },
+    "displayName": {
+     "type": "any"
+    },
+    "drinker": {
+     "type": "any"
+    },
+    "emails": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "primary": {
+        "type": "any"
+       },
+       "type": {
+        "type": "any"
+       },
+       "value": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "ethnicity": {
+     "type": "any"
+    },
+    "fashion": {
+     "type": "any"
+    },
+    "food": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "gender": {
+     "type": "any"
+    },
+    "happiestWhen": {
+     "type": "any"
+    },
+    "hasApp": {
+     "type": "any"
+    },
+    "heroes": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "humor": {
+     "type": "any"
+    },
+    "id": {
+     "type": "any"
+    },
+    "ims": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "primary": {
+        "type": "any"
+       },
+       "type": {
+        "type": "any"
+       },
+       "value": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "interests": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "jobInterests": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#person"
+    },
+    "languages": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "languagesSpoken": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "livingArrangement": {
+     "type": "any"
+    },
+    "lookingFor": {
+     "type": "any"
+    },
+    "movies": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "music": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "name": {
+     "type": "object",
+     "properties": {
+      "familyName": {
+       "type": "any"
+      },
+      "formatted": {
+       "type": "any"
+      },
+      "givenName": {
+       "type": "any"
+      },
+      "honorificPrefix": {
+       "type": "any"
+      },
+      "honorificSuffix": {
+       "type": "any"
+      },
+      "middleName": {
+       "type": "any"
+      }
+     }
+    },
+    "nickname": {
+     "type": "any"
+    },
+    "note": {
+     "type": "any"
+    },
+    "organizations": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "department": {
+        "type": "any"
+       },
+       "description": {
+        "type": "any"
+       },
+       "endDate": {
+        "type": "any"
+       },
+       "location": {
+        "type": "any"
+       },
+       "name": {
+        "type": "any"
+       },
+       "primary": {
+        "type": "any"
+       },
+       "startDate": {
+        "type": "any"
+       },
+       "title": {
+        "type": "any"
+       },
+       "type": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "pets": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "phoneNumbers": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "primary": {
+        "type": "any"
+       },
+       "type": {
+        "type": "any"
+       },
+       "value": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "photos": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "height": {
+        "type": "any"
+       },
+       "primary": {
+        "type": "any"
+       },
+       "type": {
+        "type": "any"
+       },
+       "value": {
+        "type": "any"
+       },
+       "width": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "politicalViews": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "preferredUsername": {
+     "type": "any"
+    },
+    "profileSong": {
+     "type": "any"
+    },
+    "profileUrl": {
+     "type": "any"
+    },
+    "profileVideo": {
+     "type": "any"
+    },
+    "published": {
+     "type": "string"
+    },
+    "quotes": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "relationshipStatus": {
+     "type": "any"
+    },
+    "relationships": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "religion": {
+     "type": "any"
+    },
+    "romance": {
+     "type": "any"
+    },
+    "scaredOf": {
+     "type": "any"
+    },
+    "sexualOrientation": {
+     "type": "any"
+    },
+    "smoker": {
+     "type": "any"
+    },
+    "sports": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "status": {
+     "type": "any"
+    },
+    "tags": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "thumbnailUrl": {
+     "type": "any"
+    },
+    "turnOffs": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "turnOns": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "tvShows": {
+     "type": "array",
+     "items": {
+      "type": "any"
+     }
+    },
+    "updated": {
+     "type": "string"
+    },
+    "urls": {
+     "type": "array",
+     "items": {
+      "type": "object",
+      "properties": {
+       "primary": {
+        "type": "any"
+       },
+       "type": {
+        "type": "any"
+       },
+       "value": {
+        "type": "any"
+       }
+      }
+     }
+    },
+    "utcOffset": {
+     "type": "any"
+    }
+   }
+  },
+  "PhotosFeed": {
+   "id": "PhotosFeed",
+   "type": "object",
+   "properties": {
+    "items": {
+     "type": "array",
+     "items": {
+      "$ref": "ChiliPhotosResourceJson"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#photosFeed"
+    }
+   }
+  },
+  "Related": {
+   "id": "Related",
+   "type": "object",
+   "properties": {
+    "href": {
+     "type": "any"
+    },
+    "id": {
+     "type": "any"
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#related"
+    },
+    "summary": {
+     "type": "any"
+    },
+    "title": {
+     "type": "any"
+    }
+   }
+  },
+  "RelatedFeed": {
+   "id": "RelatedFeed",
+   "type": "object",
+   "properties": {
+    "id": {
+     "type": "any"
+    },
+    "items": {
+     "type": "array",
+     "items": {
+      "$ref": "Related"
+     }
+    },
+    "kind": {
+     "type": "string",
+     "default": "buzz#relatedFeed"
+    },
+    "links": {
+     "type": "object",
+     "additionalProperties": {
+      "type": "array",
+      "items": {
+       "type": "object",
+       "properties": {
+        "count": {
+         "type": "any"
+        },
+        "height": {
+         "type": "any"
+        },
+        "href": {
+         "type": "any"
+        },
+        "title": {
+         "type": "any"
+        },
+        "type": {
+         "type": "any"
+        },
+        "updated": {
+         "type": "string"
+        },
+        "width": {
+         "type": "any"
+        }
+       }
+      }
+     }
+    },
+    "title": {
+     "type": "any"
+    },
+    "updated": {
+     "type": "string"
+    }
+   }
+  },
+  "Video": {
+   "id": "Video",
+   "type": "object",
+   "properties": {
+    "duration": {
+     "type": "integer"
+    },
+    "size": {
+     "type": "integer"
+    },
+    "status": {
+     "type": "string"
+    },
+    "streams": {
+     "type": "array",
+     "items": {
+      "$ref": "Link"
+     }
+    }
+   }
+  }
+ },
  "resources": {
   "activities": {
    "methods": {
     "count": {
-     "restPath": "activities/count",
-     "rpcMethod": "chili.activities.count",
+     "id": "chili.activities.count",
+     "path": "activities/count",
      "httpMethod": "GET",
+     "description": "Get a count of link shares",
      "parameters": {
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
+      },
+      "url": {
+       "type": "string",
+       "description": "URLs for which to get share counts.",
+       "repeated": true,
+       "location": "query"
       }
-     }
+     },
+     "response": {
+      "$ref": "CountFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "delete": {
-     "restPath": "activities/{userId}/{scope}/{postId}",
-     "rpcMethod": "chili.activities.delete",
+     "id": "chili.activities.delete",
+     "path": "activities/{userId}/{scope}/{postId}",
      "httpMethod": "DELETE",
+     "description": "Delete an activity",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity to delete.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
+       "type": "string",
+       "description": "The collection to which the activity belongs.",
        "required": true,
-       "repeated": false
+       "enum": [
+        "@liked",
+        "@muted",
+        "@self"
+       ],
+       "enumDescriptions": [
+        "Activities liked by the user.",
+        "Activities muted by the user.",
+        "Activities posted by the user."
+       ],
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user whose post to delete.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope",
+      "postId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     },
     "extractPeopleFromSearch": {
-     "restPath": "activities/search/@people",
-     "rpcMethod": "chili.activities.extractPeopleFromSearch",
+     "id": "chili.activities.extractPeopleFromSearch",
+     "path": "activities/search/@people",
      "httpMethod": "GET",
+     "description": "Search for people by topic",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "bbox": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Bounding box to use in a geographic location query.",
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "lat": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Latitude to use in a geographic location query.",
+       "location": "query"
       },
       "lon": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Longitude to use in a geographic location query.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "pid": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "ID of a place to use in a geographic location query.",
+       "location": "query"
       },
       "q": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Full-text search query string.",
+       "location": "query"
       },
       "radius": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Radius to use in a geographic location query.",
+       "location": "query"
       }
-     }
+     },
+     "response": {
+      "$ref": "PeopleFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "get": {
-     "restPath": "activities/{userId}/@self/{postId}",
-     "rpcMethod": "chili.activities.get",
+     "id": "chili.activities.get",
+     "path": "activities/{userId}/@self/{postId}",
      "httpMethod": "GET",
+     "description": "Get an activity",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
-       "required": true,
-       "repeated": false
-      },
-      "targetLang": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "truncateAtom": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
-       "required": true,
-       "repeated": false
-      }
-     }
-    },
-    "insert": {
-     "restPath": "activities/{userId}/@self",
-     "rpcMethod": "chili.activities.insert",
-     "httpMethod": "POST",
-     "parameters": {
-      "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "preview": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
-       "required": true,
-       "repeated": false
-      }
-     }
-    },
-    "list": {
-     "restPath": "activities/{userId}/{scope}",
-     "rpcMethod": "chili.activities.list",
-     "httpMethod": "GET",
-     "parameters": {
-      "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-comments": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of comments to include.",
+       "default": "0",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "max-liked": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "scope": {
-       "restParameterType": "path",
-       "pattern": "@(self|public|consumption|liked|comments)*",
-       "required": true,
-       "repeated": false
-      },
-      "targetLang": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "truncateAtom": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
-       "required": true,
-       "repeated": false
-      }
-     }
-    },
-    "search": {
-     "restPath": "activities/search",
-     "rpcMethod": "chili.activities.search",
-     "httpMethod": "GET",
-     "parameters": {
-      "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "bbox": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "lat": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "lon": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "pid": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "q": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "radius": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "targetLang": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "truncateAtom": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      }
-     }
-    },
-    "track": {
-     "restPath": "activities/track",
-     "rpcMethod": "chili.activities.track",
-     "httpMethod": "GET",
-     "parameters": {
-      "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "bbox": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "lat": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "lon": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "pid": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "q": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "radius": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      }
-     }
-    },
-    "update": {
-     "restPath": "activities/{userId}/{scope}/{postId}",
-     "rpcMethod": "chili.activities.update",
-     "httpMethod": "PUT",
-     "parameters": {
-      "abuseType": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of likes to include.",
+       "default": "0",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the post to get.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
-      "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
-       "required": true,
-       "repeated": false
+      "truncateAtom": {
+       "type": "boolean",
+       "description": "Truncate the value of the atom:content element.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user whose post to get.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "postId"
+     ],
+     "response": {
+      "$ref": "Activity"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
+    },
+    "insert": {
+     "id": "chili.activities.insert",
+     "path": "activities/{userId}/@self",
+     "httpMethod": "POST",
+     "description": "Create a new activity",
+     "parameters": {
+      "alt": {
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
+      },
+      "hl": {
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
+      },
+      "preview": {
+       "type": "boolean",
+       "description": "If true, only preview the action.",
+       "default": "false",
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user being referenced.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "request": {
+      "$ref": "Activity"
+     },
+     "response": {
+      "$ref": "Activity"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
+    },
+    "list": {
+     "id": "chili.activities.list",
+     "path": "activities/{userId}/{scope}",
+     "httpMethod": "GET",
+     "description": "List activities",
+     "parameters": {
+      "alt": {
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
+      },
+      "c": {
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
+      },
+      "hl": {
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
+      },
+      "max-comments": {
+       "type": "integer",
+       "description": "Maximum number of comments to include.",
+       "default": "0",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
+      },
+      "max-liked": {
+       "type": "integer",
+       "description": "Maximum number of likes to include.",
+       "default": "0",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
+      },
+      "max-results": {
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
+      },
+      "scope": {
+       "type": "string",
+       "description": "The collection of activities to list.",
+       "required": true,
+       "enum": [
+        "@comments",
+        "@consumption",
+        "@liked",
+        "@public",
+        "@self"
+       ],
+       "enumDescriptions": [
+        "Limit to activities commented on by the user.",
+        "Limit to activities to be consumed by the user.",
+        "Limit to activities liked by the user.",
+        "Limit to public activities posted by the user.",
+        "Limit to activities posted by the user."
+       ],
+       "location": "path"
+      },
+      "truncateAtom": {
+       "type": "boolean",
+       "description": "Truncate the value of the atom:content element.",
+       "location": "query"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user being referenced.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope"
+     ],
+     "response": {
+      "$ref": "ActivityFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
+    },
+    "search": {
+     "id": "chili.activities.search",
+     "path": "activities/search",
+     "httpMethod": "GET",
+     "description": "Search for activities",
+     "parameters": {
+      "alt": {
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
+      },
+      "bbox": {
+       "type": "string",
+       "description": "Bounding box to use in a geographic location query.",
+       "location": "query"
+      },
+      "c": {
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
+      },
+      "hl": {
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
+      },
+      "lat": {
+       "type": "string",
+       "description": "Latitude to use in a geographic location query.",
+       "location": "query"
+      },
+      "lon": {
+       "type": "string",
+       "description": "Longitude to use in a geographic location query.",
+       "location": "query"
+      },
+      "max-results": {
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
+      },
+      "pid": {
+       "type": "string",
+       "description": "ID of a place to use in a geographic location query.",
+       "location": "query"
+      },
+      "q": {
+       "type": "string",
+       "description": "Full-text search query string.",
+       "location": "query"
+      },
+      "radius": {
+       "type": "string",
+       "description": "Radius to use in a geographic location query.",
+       "location": "query"
+      },
+      "truncateAtom": {
+       "type": "boolean",
+       "description": "Truncate the value of the atom:content element.",
+       "location": "query"
+      }
+     },
+     "response": {
+      "$ref": "ActivityFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
+    },
+    "track": {
+     "id": "chili.activities.track",
+     "path": "activities/track",
+     "httpMethod": "GET",
+     "description": "Get real-time activity tracking information",
+     "parameters": {
+      "alt": {
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
+      },
+      "bbox": {
+       "type": "string",
+       "description": "Bounding box to use in a geographic location query.",
+       "location": "query"
+      },
+      "c": {
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
+      },
+      "hl": {
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
+      },
+      "lat": {
+       "type": "string",
+       "description": "Latitude to use in a geographic location query.",
+       "location": "query"
+      },
+      "lon": {
+       "type": "string",
+       "description": "Longitude to use in a geographic location query.",
+       "location": "query"
+      },
+      "max-results": {
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
+      },
+      "pid": {
+       "type": "string",
+       "description": "ID of a place to use in a geographic location query.",
+       "location": "query"
+      },
+      "q": {
+       "type": "string",
+       "description": "Full-text search query string.",
+       "location": "query"
+      },
+      "radius": {
+       "type": "string",
+       "description": "Radius to use in a geographic location query.",
+       "location": "query"
+      }
+     },
+     "response": {
+      "$ref": "ActivityFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
+    },
+    "update": {
+     "id": "chili.activities.update",
+     "path": "activities/{userId}/{scope}/{postId}",
+     "httpMethod": "PUT",
+     "description": "Update an activity",
+     "parameters": {
+      "abuseType": {
+       "type": "string",
+       "location": "query"
+      },
+      "alt": {
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
+      },
+      "hl": {
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
+      },
+      "postId": {
+       "type": "string",
+       "description": "ID of the activity to update.",
+       "required": true,
+       "location": "path"
+      },
+      "scope": {
+       "type": "string",
+       "description": "The collection to which the activity belongs.",
+       "required": true,
+       "enum": [
+        "@abuse",
+        "@liked",
+        "@muted",
+        "@self"
+       ],
+       "enumDescriptions": [
+        "Activities reported by the user.",
+        "Activities liked by the user.",
+        "Activities muted by the user.",
+        "Activities posted by the user."
+       ],
+       "location": "path"
+      },
+      "userId": {
+       "type": "string",
+       "description": "ID of the user whose post to update.",
+       "required": true,
+       "location": "path"
+      }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope",
+      "postId"
+     ],
+     "request": {
+      "$ref": "Activity"
+     },
+     "response": {
+      "$ref": "Activity"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     }
    }
   },
   "comments": {
    "methods": {
     "delete": {
-     "restPath": "activities/{userId}/@self/{postId}/@comments/{commentId}",
-     "rpcMethod": "chili.comments.delete",
+     "id": "chili.comments.delete",
+     "path": "activities/{userId}/@self/{postId}/@comments/{commentId}",
      "httpMethod": "DELETE",
+     "description": "Delete a comment",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "commentId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the comment being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity for which to delete the comment.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "postId",
+      "commentId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     },
     "get": {
-     "restPath": "activities/{userId}/@self/{postId}/@comments/{commentId}",
-     "rpcMethod": "chili.comments.get",
+     "id": "chili.comments.get",
+     "path": "activities/{userId}/@self/{postId}/@comments/{commentId}",
      "httpMethod": "GET",
+     "description": "Get a comment",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "commentId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the comment being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity for which to get comments.",
        "required": true,
-       "repeated": false
-      },
-      "targetLang": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "postId",
+      "commentId"
+     ],
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "insert": {
-     "restPath": "activities/{userId}/@self/{postId}/@comments",
-     "rpcMethod": "chili.comments.insert",
+     "id": "chili.comments.insert",
+     "path": "activities/{userId}/@self/{postId}/@comments",
      "httpMethod": "POST",
+     "description": "Create a comment",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity on which to comment.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user on whose behalf to comment.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "postId"
+     ],
+     "request": {
+      "$ref": "Comment"
+     },
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     },
     "list": {
-     "restPath": "activities/{userId}/{scope}/{postId}/@comments",
-     "rpcMethod": "chili.comments.list",
+     "id": "chili.comments.list",
+     "path": "activities/{userId}/{scope}/{postId}/@comments",
      "httpMethod": "GET",
+     "description": "List comments",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity for which to get comments.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
+       "type": "string",
+       "description": "The collection to which the activity belongs.",
        "required": true,
-       "repeated": false
-      },
-      "targetLang": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "enum": [
+        "@self"
+       ],
+       "enumDescriptions": [
+        "Activities posted by the user."
+       ],
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user for whose post to get comments.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope",
+      "postId"
+     ],
+     "response": {
+      "$ref": "CommentFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "update": {
-     "restPath": "activities/{userId}/{scope}/{postId}/@comments/{commentId}",
-     "rpcMethod": "chili.comments.update",
+     "id": "chili.comments.update",
+     "path": "activities/{userId}/{scope}/{postId}/@comments/{commentId}",
      "httpMethod": "PUT",
+     "description": "Update a comment",
      "parameters": {
       "abuseType": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "location": "query"
       },
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "commentId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the comment being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity for which to update the comment.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
+       "type": "string",
+       "description": "The collection to which the activity belongs.",
        "required": true,
-       "repeated": false
+       "enum": [
+        "@abuse",
+        "@self"
+       ],
+       "enumDescriptions": [
+        "Comments reported by the user.",
+        "Comments posted by the user."
+       ],
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope",
+      "postId",
+      "commentId"
+     ],
+     "request": {
+      "$ref": "Comment"
+     },
+     "response": {
+      "$ref": "Comment"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     }
    }
   },
   "groups": {
    "methods": {
     "delete": {
-     "restPath": "people/{userId}/@groups/{groupId}",
-     "rpcMethod": "chili.groups.delete",
+     "id": "chili.groups.delete",
+     "path": "people/{userId}/@groups/{groupId}",
      "httpMethod": "DELETE",
+     "description": "Delete a group",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the group to delete.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "groupId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     },
     "get": {
-     "restPath": "people/{userId}/@groups/{groupId}/@self",
-     "rpcMethod": "chili.groups.get",
+     "id": "chili.groups.get",
+     "path": "people/{userId}/@groups/{groupId}/@self",
      "httpMethod": "GET",
+     "description": "Get a group",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the group to get.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "groupId"
+     ],
+     "response": {
+      "$ref": "Group"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "insert": {
-     "restPath": "people/{userId}/@groups",
-     "rpcMethod": "chili.groups.insert",
+     "id": "chili.groups.insert",
+     "path": "people/{userId}/@groups",
      "httpMethod": "POST",
+     "description": "Create a group",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "request": {
+      "$ref": "Group"
+     },
+     "response": {
+      "$ref": "Group"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     },
     "list": {
-     "restPath": "people/{userId}/@groups",
-     "rpcMethod": "chili.groups.list",
+     "id": "chili.groups.list",
+     "path": "people/{userId}/@groups",
      "httpMethod": "GET",
+     "description": "Get a user's groups",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "response": {
+      "$ref": "GroupFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "update": {
-     "restPath": "people/{userId}/@groups/{groupId}/@self",
-     "rpcMethod": "chili.groups.update",
+     "id": "chili.groups.update",
+     "path": "people/{userId}/@groups/{groupId}/@self",
      "httpMethod": "PUT",
+     "description": "Update a group",
      "parameters": {
+      "alt": {
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
+      },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the group to update.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "groupId"
+     ],
+     "request": {
+      "$ref": "Group"
+     },
+     "response": {
+      "$ref": "Group"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     }
    }
   },
   "people": {
    "methods": {
     "delete": {
-     "restPath": "people/{userId}/@groups/{groupId}/{personId}",
-     "rpcMethod": "chili.people.delete",
+     "id": "chili.people.delete",
+     "path": "people/{userId}/@groups/{groupId}/{personId}",
      "httpMethod": "DELETE",
+     "description": "Remove a person from a group",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the group from which to remove the person.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "personId": {
-       "restParameterType": "path",
-       "pattern": "(?!@self).*",
+       "type": "string",
+       "description": "ID of the person to remove from the group.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the owner of the group.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "groupId",
+      "personId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     },
     "get": {
-     "restPath": "people/{userId}/@self",
-     "rpcMethod": "chili.people.get",
+     "id": "chili.people.get",
+     "path": "people/{userId}/@self",
      "httpMethod": "GET",
+     "description": "Get a user profile",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "response": {
+      "$ref": "Person"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "liked": {
-     "restPath": "activities/{userId}/{scope}/{postId}/{groupId}",
-     "rpcMethod": "chili.people.liked",
+     "id": "chili.people.liked",
+     "path": "activities/{userId}/{scope}/{postId}/{groupId}",
      "httpMethod": "GET",
+     "description": "Get people who liked an activity",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "@liked",
+       "type": "string",
        "required": true,
-       "repeated": false
+       "enum": [
+        "@liked"
+       ],
+       "enumDescriptions": [
+        "People who liked this activity."
+       ],
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity that was liked.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
+       "type": "string",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope",
+      "postId",
+      "groupId"
+     ],
+     "response": {
+      "$ref": "PeopleFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "list": {
-     "restPath": "people/{userId}/@groups/{groupId}",
-     "rpcMethod": "chili.people.list",
+     "id": "chili.people.list",
+     "path": "people/{userId}/@groups/{groupId}",
      "httpMethod": "GET",
+     "description": "Get people in a group",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the group for which to list users.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
-    },
-    "relatedToUri": {
-     "restPath": "people/{userId}/@related",
-     "rpcMethod": "chili.people.relatedToUri",
-     "httpMethod": "GET",
-     "parameters": {
-      "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "uri": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
-       "required": true,
-       "repeated": false
-      }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "groupId"
+     ],
+     "response": {
+      "$ref": "PeopleFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "reshared": {
-     "restPath": "activities/{userId}/{scope}/{postId}/{groupId}",
-     "rpcMethod": "chili.people.reshared",
+     "id": "chili.people.reshared",
+     "path": "activities/{userId}/{scope}/{postId}/{groupId}",
      "httpMethod": "GET",
+     "description": "Get people who reshared an activity",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "@reshared",
+       "type": "string",
        "required": true,
-       "repeated": false
+       "enum": [
+        "@reshared"
+       ],
+       "enumDescriptions": [
+        "People who reshared this activity."
+       ],
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity that was reshared.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
+       "type": "string",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope",
+      "postId",
+      "groupId"
+     ],
+     "response": {
+      "$ref": "PeopleFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "search": {
-     "restPath": "people/search",
-     "rpcMethod": "chili.people.search",
+     "id": "chili.people.search",
+     "path": "people/search",
      "httpMethod": "GET",
+     "description": "Search for people",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "q": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Full-text search query string.",
+       "location": "query"
       }
-     }
+     },
+     "response": {
+      "$ref": "PeopleFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     },
     "update": {
-     "restPath": "people/{userId}/@groups/{groupId}/{personId}",
-     "rpcMethod": "chili.people.update",
+     "id": "chili.people.update",
+     "path": "people/{userId}/@groups/{groupId}/{personId}",
      "httpMethod": "PUT",
+     "description": "Add a person to a group",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "groupId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the group to which to add the person.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "personId": {
-       "restParameterType": "path",
-       "pattern": "(?!@self).*",
+       "type": "string",
+       "description": "ID of the person to add to the group.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the owner of the group.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "groupId",
+      "personId"
+     ],
+     "request": {
+      "$ref": "Person"
+     },
+     "response": {
+      "$ref": "Person"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     }
    }
   },
   "photoAlbums": {
    "methods": {
     "delete": {
-     "restPath": "photos/{userId}/@self/{albumId}",
-     "rpcMethod": "chili.photoAlbums.delete",
+     "id": "chili.photoAlbums.delete",
+     "path": "photos/{userId}/@self/{albumId}",
      "httpMethod": "DELETE",
+     "description": "Delete a photo album",
      "parameters": {
       "albumId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the album to delete.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "albumId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     },
     "get": {
-     "restPath": "photos/{userId}/@self/{albumId}",
-     "rpcMethod": "chili.photoAlbums.get",
+     "id": "chili.photoAlbums.get",
+     "path": "photos/{userId}/@self/{albumId}",
      "httpMethod": "GET",
+     "description": "Get a photo album",
      "parameters": {
       "albumId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the album to get.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "albumId"
+     ],
+     "response": {
+      "$ref": "Album"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     },
     "insert": {
-     "restPath": "photos/{userId}/@self",
-     "rpcMethod": "chili.photoAlbums.insert",
+     "id": "chili.photoAlbums.insert",
+     "path": "photos/{userId}/@self",
      "httpMethod": "POST",
+     "description": "Create a photo album",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId"
+     ],
+     "request": {
+      "$ref": "Album"
+     },
+     "response": {
+      "$ref": "Album"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     },
     "list": {
-     "restPath": "photos/{userId}/{scope}",
-     "rpcMethod": "chili.photoAlbums.list",
+     "id": "chili.photoAlbums.list",
+     "path": "photos/{userId}/{scope}",
      "httpMethod": "GET",
+     "description": "List a user's photo albums",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@(self)*",
+       "type": "string",
+       "description": "The collection of albums to list.",
        "required": true,
-       "repeated": false
+       "enum": [
+        "@self"
+       ],
+       "enumDescriptions": [
+        "Albums posted by the user."
+       ],
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope"
+     ],
+     "response": {
+      "$ref": "AlbumsFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     }
    }
   },
   "photos": {
    "methods": {
     "delete": {
-     "restPath": "photos/{userId}/@self/{albumId}/@photos/{photoId}",
-     "rpcMethod": "chili.photos.delete",
+     "id": "chili.photos.delete",
+     "path": "photos/{userId}/@self/{albumId}/@photos/{photoId}",
      "httpMethod": "DELETE",
+     "description": "Delete a photo",
      "parameters": {
       "albumId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the album to which to photo belongs.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "photoId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the photo to delete.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "albumId",
+      "photoId"
+     ],
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     },
     "get": {
-     "restPath": "photos/{userId}/@self/{albumId}/@photos/{photoId}",
-     "rpcMethod": "chili.photos.get",
+     "id": "chili.photos.get",
+     "path": "photos/{userId}/@self/{albumId}/@photos/{photoId}",
      "httpMethod": "GET",
+     "description": "Get photo metadata",
      "parameters": {
       "albumId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the album containing the photo.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "photoId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the photo for which to get metadata.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "albumId",
+      "photoId"
+     ],
+     "response": {
+      "$ref": "ChiliPhotosResourceJson"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     },
     "insert": {
-     "restPath": "photos/{userId}/{albumId}",
-     "rpcMethod": "chili.photos.insert",
+     "id": "chili.photos.insert",
+     "path": "photos/{userId}/{albumId}",
      "httpMethod": "POST",
+     "description": "Upload a photo to an album",
      "parameters": {
       "albumId": {
-       "restParameterType": "path",
-       "pattern": "(@new|[^@].*)",
+       "type": "string",
+       "description": "ID of the album to which to upload.",
        "required": true,
-       "repeated": false
+       "location": "path"
+      },
+      "alt": {
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "albumId"
+     ],
+     "request": {
+      "$ref": "AlbumLite"
+     },
+     "response": {
+      "$ref": "AlbumLite"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz"
+     ]
     },
     "insert2": {
-     "restPath": "photos/{userId}/@self/{albumId}/@photos",
-     "rpcMethod": "chili.photos.insert2",
-     "httpMethod": "GET",
+     "id": "chili.photos.insert2",
+     "path": "photos/{userId}/@self/{albumId}/@photos",
+     "httpMethod": "POST",
+     "description": "Upload a photo to an album",
      "parameters": {
       "albumId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the album to which to upload.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "albumId"
+     ],
+     "request": {
+      "$ref": "ChiliPhotosResourceJson"
+     },
+     "response": {
+      "$ref": "ChiliPhotosResourceJson"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     },
     "listByAlbum": {
-     "restPath": "photos/{userId}/@self/{albumId}/@photos",
-     "rpcMethod": "chili.photos.listByAlbum",
+     "id": "chili.photos.listByAlbum",
+     "path": "photos/{userId}/@self/{albumId}/@photos",
      "httpMethod": "GET",
+     "description": "List photos in an album",
      "parameters": {
       "albumId": {
-       "restParameterType": "path",
-       "pattern": "[^@].*",
+       "type": "string",
+       "description": "ID of the album for which to list photos.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "albumId"
+     ],
+     "response": {
+      "$ref": "PhotosFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     },
     "listByScope": {
-     "restPath": "photos/{userId}/@self/{scope}/@photos",
-     "rpcMethod": "chili.photos.listByScope",
+     "id": "chili.photos.listByScope",
+     "path": "photos/{userId}/@self/{scope}/@photos",
      "httpMethod": "GET",
+     "description": "Get a user's photos",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "A continuation token that allows pagination.",
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "integer",
+       "description": "Maximum number of results to include.",
+       "default": "20",
+       "minimum": "0",
+       "maximum": "4294967295",
+       "location": "query"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
+       "type": "string",
+       "description": "The collection of photos to list.",
        "required": true,
-       "repeated": false
+       "enum": [
+        "@recent"
+       ],
+       "enumDescriptions": [
+        "Recent photos uploaded by the user."
+       ],
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope"
+     ],
+     "response": {
+      "$ref": "PhotosFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/picasa"
+     ]
     }
    }
   },
   "related": {
    "methods": {
     "list": {
-     "restPath": "activities/{userId}/{scope}/{postId}/@related",
-     "rpcMethod": "chili.related.list",
+     "id": "chili.related.list",
+     "path": "activities/{userId}/{scope}/{postId}/@related",
      "httpMethod": "GET",
+     "description": "Get related links for an activity",
      "parameters": {
       "alt": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "c": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Specifies an alternative representation type.",
+       "default": "atom",
+       "enum": [
+        "atom",
+        "json"
+       ],
+       "enumDescriptions": [
+        "Use Atom XML format",
+        "Use JSON format"
+       ],
+       "location": "query"
       },
       "hl": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
-      },
-      "max-results": {
-       "restParameterType": "query",
-       "required": false,
-       "repeated": false
+       "type": "string",
+       "description": "Language code to limit language results.",
+       "location": "query"
       },
       "postId": {
-       "restParameterType": "path",
-       "pattern": ".*",
+       "type": "string",
+       "description": "ID of the activity to which to get related links.",
        "required": true,
-       "repeated": false
+       "location": "path"
       },
       "scope": {
-       "restParameterType": "path",
-       "pattern": "@.*",
+       "type": "string",
+       "description": "The collection to which the activity belongs.",
        "required": true,
-       "repeated": false
+       "enum": [
+        "@self"
+       ],
+       "enumDescriptions": [
+        "Activities posted by the user."
+       ],
+       "location": "path"
       },
       "userId": {
-       "restParameterType": "path",
-       "pattern": "[^/]+",
+       "type": "string",
+       "description": "ID of the user being referenced.",
        "required": true,
-       "repeated": false
+       "location": "path"
       }
-     }
+     },
+     "parameterOrder": [
+      "userId",
+      "scope",
+      "postId"
+     ],
+     "response": {
+      "$ref": "RelatedFeed"
+     },
+     "scopes": [
+      "https://www.googleapis.com/auth/buzz",
+      "https://www.googleapis.com/auth/buzz.readonly"
+     ]
     }
    }
   }
diff --git a/samples/localdiscovery/buzz.py b/samples/localdiscovery/buzz.py
index c769576..31ad031 100644
--- a/samples/localdiscovery/buzz.py
+++ b/samples/localdiscovery/buzz.py
@@ -11,52 +11,14 @@
 
 __author__ = 'jcgregorio@google.com (Joe Gregorio)'
 
-from apiclient.discovery import build
 from apiclient.discovery import build_from_document
-from apiclient.oauth import FlowThreeLegged
-from apiclient.ext.authtools import run
-from apiclient.ext.file import Storage
-from apiclient.oauth import CredentialsInvalidError
 
-import gflags
-import sys
 import httplib2
-import logging
 import os
 import pprint
-import sys
 
-FLAGS = gflags.FLAGS
-
-gflags.DEFINE_enum('logging_level', 'ERROR',
-    ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'],
-    'Set the level of logging detail.')
-
-
-def main(argv):
-  try:
-    argv = FLAGS(argv)
-  except gflags.FlagsError, e:
-    print '%s\\nUsage: %s ARGS\\n%s' % (e, argv[0], FLAGS)
-    sys.exit(1)
-
-  logging.getLogger().setLevel(getattr(logging, FLAGS.logging_level))
-
-  storage = Storage('buzz.dat')
-  credentials = storage.get()
-  if credentials is None or credentials.invalid == True:
-    buzz_discovery = build("buzz", "v1").auth_discovery()
-    flow = FlowThreeLegged(buzz_discovery,
-        consumer_key='anonymous',
-        consumer_secret='anonymous',
-        user_agent='python-buzz-sample/1.0',
-        domain='anonymous',
-        scope='https://www.googleapis.com/auth/buzz',
-        xoauth_displayname='Google API Client Example App')
-    credentials = run(flow, storage)
-
+def main():
   http = httplib2.Http()
-  http = credentials.authorize(http)
 
   # Load the local copy of the discovery document
   f = file(os.path.join(os.path.dirname(__file__), "buzz.json"), "r")
@@ -71,20 +33,11 @@
   # Construct a service from the local documents
   service = build_from_document(discovery,
       base="https://www.googleapis.com/",
-      future=future,
       http=http,
-      developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
-  activities = service.activities()
+      future=future)
 
-  try:
-    # Retrieve the first two activities
-    activitylist = activities.list(
-        max_results='2', scope='@self', userId='@me').execute()
-    print "Retrieved the first two activities"
-  except CredentialsInvalidError:
-    print 'Your credentials are no longer valid.'
-    print 'Please re-run this application to re-authorize.'
+  pprint.pprint(service.activities().search(q='lady gaga').execute())
 
 
 if __name__ == '__main__':
-  main(sys.argv)
+  main()