=== added file 'dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/csd/ContactPoint.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/csd/ContactPoint.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/csd/ContactPoint.java	2014-01-16 08:47:59 +0000
@@ -0,0 +1,98 @@
+package org.hisp.dhis.web.ohie.csd.domain.csd;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "contactPoint", namespace = "urn:ihe:iti:csd:2013" )
+public class ContactPoint
+{
+    @XmlElement( name = "codedType", namespace = "urn:ihe:iti:csd:2013" )
+    private CodedType codedType;
+
+    @XmlElement( name = "equipment", namespace = "urn:ihe:iti:csd:2013" )
+    private String equipment;
+
+    @XmlElement( name = "purpose", namespace = "urn:ihe:iti:csd:2013" )
+    private String purpose;
+
+    @XmlElement( name = "certificate", namespace = "urn:ihe:iti:csd:2013" )
+    private String certificate;
+
+    public ContactPoint()
+    {
+    }
+
+    public CodedType getCodedType()
+    {
+        return codedType;
+    }
+
+    public void setCodedType( CodedType codedType )
+    {
+        this.codedType = codedType;
+    }
+
+    public String getEquipment()
+    {
+        return equipment;
+    }
+
+    public void setEquipment( String equipment )
+    {
+        this.equipment = equipment;
+    }
+
+    public String getPurpose()
+    {
+        return purpose;
+    }
+
+    public void setPurpose( String purpose )
+    {
+        this.purpose = purpose;
+    }
+
+    public String getCertificate()
+    {
+        return certificate;
+    }
+
+    public void setCertificate( String certificate )
+    {
+        this.certificate = certificate;
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/csd/Facility.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/csd/Facility.java	2014-01-15 13:10:05 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/csd/Facility.java	2014-01-16 08:47:59 +0000
@@ -68,6 +68,9 @@
     @XmlElement( name = "geocode", namespace = "urn:ihe:iti:csd:2013" )
     private Geocode geocode;
 
+    @XmlElement( name = "contactPoint", namespace = "urn:ihe:iti:csd:2013" )
+    private List<ContactPoint> contactPoints = new ArrayList<ContactPoint>();
+
     @XmlElement( name = "organization", namespace = "urn:ihe:iti:csd:2013" )
     @XmlElementWrapper( name = "organizations", namespace = "urn:ihe:iti:csd:2013" )
     private List<Organization> organizations = new ArrayList<Organization>();
@@ -162,6 +165,16 @@
         this.geocode = geocode;
     }
 
+    public List<ContactPoint> getContactPoints()
+    {
+        return contactPoints;
+    }
+
+    public void setContactPoints( List<ContactPoint> contactPoints )
+    {
+        this.contactPoints = contactPoints;
+    }
+
     public List<Organization> getOrganizations()
     {
         return organizations;