Index: site/quickstart.html
===================================================================
--- site/quickstart.html	(revision 1354238)
+++ site/quickstart.html	(working copy)
@@ -245,19 +245,19 @@
 ConsumerConnector consumerConnector = Consumer.createJavaConsumerConnector(consumerConfig);
 
 // create 4 partitions of the stream for topic “test”, to allow 4 threads to consume
-Map<String, List<KafkaMessageStream<Message>>> topicMessageStreams = 
+Map<String, List<KafkaStream<Message>>> topicMessageStreams = 
     consumerConnector.createMessageStreams(ImmutableMap.of("test", 4));
-List<KafkaMessageStream<Message>> streams = topicMessageStreams.get("test");
+List<KafkaStream<Message>> streams = topicMessageStreams.get("test");
 
 // create list of 4 threads to consume from each of the partitions 
 ExecutorService executor = Executors.newFixedThreadPool(4);
 
 // consume the messages in the threads
-for(final KafkaMessageStream<Message> stream: streams) {
+for(final KafkaStream<Message> stream: streams) {
   executor.submit(new Runnable() {
     public void run() {
-      for(Message message: stream) {
-        // process message
+      for(MessageAndMetadata msgAndMetadata: stream) {
+        // process message (msgAndMetadata.message())
       }	
     }
   });
Index: site/design.html
===================================================================
--- site/design.html	(revision 1354238)
+++ site/design.html	(working copy)
@@ -365,13 +365,22 @@
 interface ConsumerConnector {
 	
   /**
-   * This method is used to get a list of KafkaMessageStreams, which are iterators over topic.
+   * This method is used to get a list of KafkaStreams, which are iterators over
+   * MessageAndMetadata objects from which you can obtain messages and their
+   * associated metadata (currently only topic).
    *  Input: a map of <topic, #streams>
    *  Output: a map of <topic, list of message streams>
-   *          Each message stream supports a message iterator.
    */
-  public Map<String,List<KafkaMessageStream>> createMessageStreams(Map<String,Int> topicCountMap); 
+  public Map<String,List<KafkaStream>> createMessageStreams(Map<String,Int> topicCountMap); 
 
+  /**
+   * You can also obtain a list of KafkaStreams, that iterate over messages
+   * from topics that match a TopicFilter. (A TopicFilter encapsulates a
+   * whitelist or a blacklist which is a standard Java regex.)
+   */
+  public List<KafkaStream> createMessageStreamsByFilter(
+      TopicFilter topicFilter, int numStreams);
+
   /* Commit the offsets of all messages consumed so far. */
   public commitOffsets()
   
@@ -380,7 +389,7 @@
 }
 </pre>
 <p>
-This API is centered around iterators, implemented by the KafkaMessageStream class. Each KafkaMessageStream represents the stream of messages from one or more partitions on one or more servers. Each stream is used for single threaded processing, so the client can provide the number of desired streams in the create call. Thus a stream may represent the merging of multiple server partitions (to correspond to the number of processing threads), but each partition only goes to one stream.
+This API is centered around iterators, implemented by the KafkaStream class. Each KafkaStream represents the stream of messages from one or more partitions on one or more servers. Each stream is used for single threaded processing, so the client can provide the number of desired streams in the create call. Thus a stream may represent the merging of multiple server partitions (to correspond to the number of processing threads), but each partition only goes to one stream.
 </p>
 <p>
 The create call registers the consumer for the topic, which results in rebalancing the consumer/broker assignment. To minimize this rebalancing the API encourages creating many topic streams in a single call.