diff --git a/src/java/net/brutex/xservices/types/AttachmentType.java b/src/java/net/brutex/xservices/types/AttachmentType.java
index 50a9905..a02a184 100644
--- a/src/java/net/brutex/xservices/types/AttachmentType.java
+++ b/src/java/net/brutex/xservices/types/AttachmentType.java
@@ -20,20 +20,32 @@ import java.io.File;
 import java.io.IOException;
 
 import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlMimeType;
 
+import net.brutex.xservices.util.BrutexNamespaces;
+
+import org.apache.cxf.aegis.type.java5.XmlElement;
+import org.apache.cxf.aegis.type.java5.XmlType;
+
+
+/**
+ * Represents a single file based attachment type.
+ * @author Brian Rosenberger, bru@brutex.de
+ * @since 0.4.0
+ */
+@XmlType(name=AttachmentType.XML_NAME, namespace=BrutexNamespaces.WS_XSERVICES)
 public class AttachmentType {
-	
+
+	public static final String XML_NAME="attachment";
 	private DataHandler content;
 	private String filename = null;
 
+	@XmlMimeType("application/octet-stream")
+	@XmlElement(minOccurs="1")
 	public void setContent(DataHandler content) {
 		this.content = content;
 	}
 
-	@XmlMimeType("application/octet-stream")
-	@XmlElement(required=true)
 	public DataHandler getContent() {
 		return content;
 	}
diff --git a/src/java/net/brutex/xservices/types/HostinfoType.java b/src/java/net/brutex/xservices/types/HostinfoType.java
index 4f8184d..15d33ec 100644
--- a/src/java/net/brutex/xservices/types/HostinfoType.java
+++ b/src/java/net/brutex/xservices/types/HostinfoType.java
@@ -22,14 +22,18 @@ import org.apache.cxf.aegis.type.java5.XmlType;
 
 
 /**
- *
+ * Host information.
  * @author Brian Rosenberger, bru@brutex.de
  */
 @XmlType(name=HostinfoType.XML_NAME, namespace=BrutexNamespaces.WS_XSERVICES)
 public class HostinfoType {
 
 	public final static String XML_NAME="hostinfo";
-    
+    private String name;
+    private String domain;
+    private String ip4;
+    private String ip6;
+        
 	/**
 	 * Create a new HostinfoType. 
 	 */
@@ -51,12 +55,6 @@ public class HostinfoType {
 		this.ip6 = ip6;
 	}
 
-    private String name;
-    private String domain;
-    private String ip4;
-    private String ip6;
-    
-    
 	/**
 	 * Get the host name.
 	 * 
diff --git a/src/java/net/brutex/xservices/types/MailMimeType.java b/src/java/net/brutex/xservices/types/MailMimeType.java
index 941cf53..4bb6be7 100644
--- a/src/java/net/brutex/xservices/types/MailMimeType.java
+++ b/src/java/net/brutex/xservices/types/MailMimeType.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
  * email body.
  *
  * @author Brian Rosenberger, bru@brutex.de
+ * @since 0.4.0
  */
 @XmlEnum(value = String.class)
 public enum MailMimeType {
diff --git a/src/java/net/brutex/xservices/ws/MiscService.java b/src/java/net/brutex/xservices/ws/MiscService.java
index c437501..1736a9b 100644
--- a/src/java/net/brutex/xservices/ws/MiscService.java
+++ b/src/java/net/brutex/xservices/ws/MiscService.java
@@ -27,7 +27,6 @@ import net.brutex.xservices.util.BrutexNamespaces;
 
 import org.apache.cxf.aegis.type.java5.XmlElement;
 import org.apache.cxf.annotations.WSDLDocumentation;
-import org.apache.cxf.annotations.WSDLDocumentationCollection;
 
 /**
  *