diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
index 69429dc32b..081ed62031 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -78,7 +78,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Represents a running broker service which consists of a number of transport
+ * Manages the lifecycle of an ActiveMQ Broker. A BrokerService consists of a number of transport
  * connectors, network connectors and a bunch of properties which can be used to
  * configure the broker as its lazily created.
  *
@@ -701,6 +701,8 @@ public class BrokerService implements Service, Serializable {
     /**
      * Sets the transport connectors which this broker will listen on for new
      * clients
+     * 
+     * @org.apache.xbean.Property nestedType="org.apache.activemq.broker.TransportConnector"
      */
     public void setTransportConnectors(List transportConnectors) throws Exception {
         for (Iterator iter = transportConnectors.iterator(); iter.hasNext();) {
@@ -720,6 +722,8 @@ public class BrokerService implements Service, Serializable {
     /**
      * Sets the network connectors which this broker will use to connect to
      * other brokers in a federated network
+     * 
+     * @org.apache.xbean.Property nestedType="org.apache.activemq.network.NetworkConnector"
      */
     public void setNetworkConnectors(List networkConnectors) throws Exception {
         for (Iterator iter = networkConnectors.iterator(); iter.hasNext();) {
diff --git a/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java b/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
index b2b2b5cfd2..53aabe6d8a 100644
--- a/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
@@ -22,14 +22,17 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 
 /**
- * Represents a running broker service which consists of a number of transport
+ * An ActiveMQ Message Broker. It consists of a number of transport
  * connectors, network connectors and a bunch of properties which can be used to
  * configure the broker as its lazily created.
  * 
- * @org.apache.xbean.XBean element="broker" rootElement="true" description="An ActiveMQ
- *                  Message Broker which consists of a number of transport
- *                  connectors, network connectors and a persistence adaptor"
- * 
+ * @org.apache.xbean.XBean element="broker" rootElement="true"
+ * @org.apache.xbean.Defaults {code:xml} 
+ * <broker test="foo.bar">
+ *   lets.
+ *   see what it includes.
+ * </broker>   
+ * {code}
  * @version $Revision: 1.1 $
  */
 public class XBeanBrokerService extends BrokerService implements InitializingBean, DisposableBean {