diff --git a/omod-2.0/pom.xml b/omod-2.0/pom.xml
index a220fddb..a6f04c5d 100644
--- a/omod-2.0/pom.xml
+++ b/omod-2.0/pom.xml
@@ -182,13 +182,21 @@
       <scope>test</scope>
     </dependency>
 
+
     <dependency>
-      <groupId>org.openmrs.module</groupId>
-      <artifactId>webservices.rest-omod</artifactId>
-      <version>${webservices.restVersion}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>webservices.rest-omod-common</artifactId>
+      <version>2.28.0</version>
+      <scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.openmrs.module</groupId>
+			<artifactId>webservices.rest-omod-common</artifactId>
+			<type>test-jar</type>
+      <scope>provided</scope>
+      <version>2.28.0</version>
+    	</dependency>
 
       <!-- END test dep. -->
 
diff --git a/omod-2.0/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource2_0.java
index c21f470e..47be8e63 100644
--- a/omod-2.0/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource2_0.java
+++ b/omod-2.0/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource2_0.java
@@ -1,5 +1,7 @@
 package org.openmrs.module.attachments.rest;
 
+import java.util.Arrays;
+
 import org.hibernate.FlushMode;
 import org.openmrs.Obs;
 import org.openmrs.api.context.Context;
@@ -7,6 +9,19 @@
 import org.openmrs.module.emrapi.db.DbSessionUtil;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
+import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
+import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
+import org.openmrs.module.webservices.rest.web.representation.RefRepresentation;
+import org.openmrs.module.webservices.rest.web.representation.Representation;
+import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingResourceDescription;
+
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
 
 @Resource(name = RestConstants.VERSION_1 + "/attachment", supportedClass = Attachment.class, supportedOpenmrsVersions = {
         "2.0.0" })
@@ -26,4 +41,83 @@ public Attachment save(Attachment delegate) {
 		}
 		return attachment;
 	}
+
+	@Override
+	public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
+		
+		if (rep instanceof DefaultRepresentation) {
+
+			DelegatingResourceDescription description = new DelegatingResourceDescription();
+			description.addProperty("uuid");
+			description.addProperty("dateTime");
+			description.addProperty("comment");
+			description.addProperty("complexData");
+			description.addSelfLink();
+			description.addLink("full", ".?v=" + RestConstants.REPRESENTATION_FULL);
+			return description;
+		} else if (rep instanceof FullRepresentation) {
+			DelegatingResourceDescription description = new DelegatingResourceDescription();
+			description.addProperty("uuid");
+			description.addProperty("dateTime");
+			description.addProperty("comment");
+			description.addProperty("auditInfo");
+			description.addProperty("complexData");
+			description.addSelfLink();
+			return description;
+		} else if (rep instanceof RefRepresentation) {
+			DelegatingResourceDescription description = new DelegatingResourceDescription();
+			description.addProperty("uuid");
+			description.addProperty("comment");
+			description.addSelfLink();
+			return description;
+		}
+		return null;
+	}
+
+	@Override
+	public Model getGETModel(Representation rep) {
+		ModelImpl model = (ModelImpl) super.getGETModel(rep);
+		if (rep instanceof DefaultRepresentation || rep instanceof FullRepresentation) {
+			model.property("uuid", new StringProperty()).property("display", new StringProperty())
+
+			        .property("comment", new BooleanProperty()).property("Datetime", new DateProperty())
+			        .property("complexData", new StringProperty())
+
+			        .addProperty("voided", new BooleanProperty());
+		}
+		if (rep instanceof DefaultRepresentation) {
+			model.property("complexData", new RefProperty("#/definitions/AttachmentComplexDataGetRef")).property("comment",
+			    new RefProperty("#/definitions/AttachmentCommentGetRef"));
+
+		} else if (rep instanceof FullRepresentation) {
+			model.property("display", new RefProperty("#/definitions/AttachmentDisplayGet"))
+			        .property("comment", new RefProperty("#/definitions/AttachmentCommentGet"))
+			        .property("datetime", new ArrayProperty(new RefProperty("#/definitions/AttachmentDateTimeGet")))
+			        .property("complexData", new ArrayProperty(new RefProperty("#/definitions/AttachmentComplexDataGet")));
+		}
+		return model;
+	}
+
+	@Override
+	public Model getCREATEModel(Representation representation) {
+		ModelImpl model = new ModelImpl()
+		        .property("display", new ArrayProperty(new RefProperty("#/definitions/AttachmentDisplayCreate")))
+
+		        .property("dataTime", new DateProperty())
+
+		        .property("comment", new ArrayProperty(new RefProperty("#/definitions/AttachmentCommentCreate")))
+		        .property("complexData", new ArrayProperty(new RefProperty("#/definitions/AttachmentComplexDataCreate")));
+
+		model.setRequired(Arrays.asList("comment", "datetime"));
+		return model;
+	}
+
+	@Override
+	public Model getUPDATEModel(Representation representation) {
+		return new ModelImpl().property("uuid", new BooleanProperty()).property("comment", new StringProperty())
+		        .property("dateTime", new DateProperty())
+
+		        .property("complexData", new ArrayProperty(new RefProperty("#/definitions/AttachmentComplexDataCreate")));
+
+	}
 }