=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Address.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Address.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Address.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,74 @@
+package org.hisp.dhis.web.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;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "address", namespace = "urn:ihe:iti:csd:2013" )
+public class Address
+{
+    @XmlElement( name = "type", namespace = "urn:ihe:iti:csd:2013" )
+    private String type;
+
+    @XmlElement( name = "addressLine", namespace = "urn:ihe:iti:csd:2013" )
+    private List<AddressLine> addressLines = new ArrayList<AddressLine>();
+
+    public Address()
+    {
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setType( String type )
+    {
+        this.type = type;
+    }
+
+    public List<AddressLine> getAddressLines()
+    {
+        return addressLines;
+    }
+
+    public void setAddressLines( List<AddressLine> addressLines )
+    {
+        this.addressLines = addressLines;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/AddressLine.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/AddressLine.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/AddressLine.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,63 @@
+package org.hisp.dhis.web.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;
+import javax.xml.bind.annotation.XmlValue;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "addressLine", namespace = "urn:ihe:iti:csd:2013" )
+public class AddressLine
+{
+    @XmlElement( name = "component", namespace = "urn:ihe:iti:csd:2013" )
+    private String component;
+
+    @XmlValue
+    private String body;
+
+    public AddressLine()
+    {
+    }
+
+    public String getComponent()
+    {
+        return component;
+    }
+
+    public void setComponent( String component )
+    {
+        this.component = component;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/CodedType.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/CodedType.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/CodedType.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,86 @@
+package org.hisp.dhis.web.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.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "codedType", namespace = "urn:ihe:iti:csd:2013" )
+public class CodedType
+{
+    @XmlAttribute( name = "code", required = true )
+    private String code;
+
+    @XmlAttribute( name = "codingSchema", required = true )
+    private String codingSchema;
+
+    @XmlValue
+    private String value;
+
+    public CodedType()
+    {
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public void setCode( String code )
+    {
+        this.code = code;
+    }
+
+    public String getCodingSchema()
+    {
+        return codingSchema;
+    }
+
+    public void setCodingSchema( String codingSchema )
+    {
+        this.codingSchema = codingSchema;
+    }
+
+    public String getValue()
+    {
+        return value;
+    }
+
+    public void setValue( String value )
+    {
+        this.value = value;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/CommonName.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/CommonName.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/CommonName.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,73 @@
+package org.hisp.dhis.web.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.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "commonName", namespace = "urn:ihe:iti:csd:2013" )
+public class CommonName
+{
+    @XmlAttribute( name = "language" )
+    private String language;
+
+    @XmlValue
+    private String body;
+
+    public CommonName()
+    {
+    }
+
+    public String getLanguage()
+    {
+        return language;
+    }
+
+    public void setLanguage( String language )
+    {
+        this.language = language;
+    }
+
+    public String getBody()
+    {
+        return body;
+    }
+
+    public void setBody( String body )
+    {
+        this.body = body;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Contact.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Contact.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Contact.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,59 @@
+package org.hisp.dhis.web.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 = "contact", namespace = "urn:ihe:iti:csd:2013" )
+public class Contact
+{
+    @XmlElement( name = "person", namespace = "urn:ihe:iti:csd:2013" )
+    private Person person;
+
+    public Contact()
+    {
+    }
+
+    public Person getPerson()
+    {
+        return person;
+    }
+
+    public void setPerson( Person person )
+    {
+        this.person = person;
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Facility.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Facility.java	2014-01-14 04:30:06 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Facility.java	2014-01-14 08:36:11 +0000
@@ -32,7 +32,10 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
@@ -44,9 +47,34 @@
     @XmlAttribute( name = "oid" )
     private String oid;
 
+    @XmlElement( name = "otherID", namespace = "urn:ihe:iti:csd:2013" )
+    private List<OtherID> otherID = new ArrayList<OtherID>();
+
+    @XmlElement( name = "codedType", namespace = "urn:ihe:iti:csd:2013" )
+    private List<CodedType> codedTypes = new ArrayList<CodedType>();
+
     @XmlElement( name = "primaryName", namespace = "urn:ihe:iti:csd:2013" )
     private String primaryName;
 
+    @XmlElement( name = "otherName", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Name> otherName = new ArrayList<Name>();
+
+    @XmlElement( name = "address", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Address> addresses = new ArrayList<Address>();
+
+    @XmlElement( name = "contact", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Contact> contacts = new ArrayList<Contact>();
+
+    @XmlElement( name = "geocode", namespace = "urn:ihe:iti:csd:2013" )
+    private Geocode geocode;
+
+    @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>();
+
+    @XmlElement( name = "operatingHours", namespace = "urn:ihe:iti:csd:2013" )
+    private List<OperatingHours> operatingHours = new ArrayList<OperatingHours>();
+
     @XmlElement( name = "record", namespace = "urn:ihe:iti:csd:2013" )
     private Record record;
 
@@ -64,6 +92,26 @@
         this.oid = oid;
     }
 
+    public List<OtherID> getOtherID()
+    {
+        return otherID;
+    }
+
+    public void setOtherID( List<OtherID> otherID )
+    {
+        this.otherID = otherID;
+    }
+
+    public List<CodedType> getCodedTypes()
+    {
+        return codedTypes;
+    }
+
+    public void setCodedTypes( List<CodedType> codedTypes )
+    {
+        this.codedTypes = codedTypes;
+    }
+
     public String getPrimaryName()
     {
         return primaryName;
@@ -74,6 +122,66 @@
         this.primaryName = primaryName;
     }
 
+    public List<Name> getOtherName()
+    {
+        return otherName;
+    }
+
+    public void setOtherName( List<Name> otherName )
+    {
+        this.otherName = otherName;
+    }
+
+    public List<Address> getAddresses()
+    {
+        return addresses;
+    }
+
+    public void setAddresses( List<Address> addresses )
+    {
+        this.addresses = addresses;
+    }
+
+    public List<Contact> getContacts()
+    {
+        return contacts;
+    }
+
+    public void setContacts( List<Contact> contacts )
+    {
+        this.contacts = contacts;
+    }
+
+    public Geocode getGeocode()
+    {
+        return geocode;
+    }
+
+    public void setGeocode( Geocode geocode )
+    {
+        this.geocode = geocode;
+    }
+
+    public List<Organization> getOrganizations()
+    {
+        return organizations;
+    }
+
+    public void setOrganizations( List<Organization> organizations )
+    {
+        this.organizations = organizations;
+    }
+
+    public List<OperatingHours> getOperatingHours()
+    {
+        return operatingHours;
+    }
+
+    public void setOperatingHours( List<OperatingHours> operatingHours )
+    {
+        this.operatingHours = operatingHours;
+    }
+
     public Record getRecord()
     {
         return record;

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Geocode.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Geocode.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Geocode.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,98 @@
+package org.hisp.dhis.web.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 = "geocode", namespace = "urn:ihe:iti:csd:2013" )
+public class Geocode
+{
+    @XmlElement( name = "latitude", namespace = "urn:ihe:iti:csd:2013", required = true )
+    private Double latitude;
+
+    @XmlElement( name = "longitude", namespace = "urn:ihe:iti:csd:2013", required = true )
+    private Double longitude;
+
+    @XmlElement( name = "altitude", namespace = "urn:ihe:iti:csd:2013" )
+    private Double altitude;
+
+    @XmlElement( name = "coordinateSystem", namespace = "urn:ihe:iti:csd:2013" )
+    private String coordinateSystem;
+
+    public Geocode()
+    {
+    }
+
+    public Double getLatitude()
+    {
+        return latitude;
+    }
+
+    public void setLatitude( Double latitude )
+    {
+        this.latitude = latitude;
+    }
+
+    public Double getLongitude()
+    {
+        return longitude;
+    }
+
+    public void setLongitude( Double longitude )
+    {
+        this.longitude = longitude;
+    }
+
+    public Double getAltitude()
+    {
+        return altitude;
+    }
+
+    public void setAltitude( Double altitude )
+    {
+        this.altitude = altitude;
+    }
+
+    public String getCoordinateSystem()
+    {
+        return coordinateSystem;
+    }
+
+    public void setCoordinateSystem( String coordinateSystem )
+    {
+        this.coordinateSystem = coordinateSystem;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Language.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Language.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Language.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,86 @@
+package org.hisp.dhis.web.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.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlValue;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "address", namespace = "urn:ihe:iti:csd:2013" )
+public class Language
+{
+    @XmlAttribute( name = "code" )
+    private String code;
+
+    @XmlAttribute( name = "codingSchema" )
+    private String codingSchema;
+
+    @XmlValue
+    private String value;
+
+    public Language()
+    {
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public void setCode( String code )
+    {
+        this.code = code;
+    }
+
+    public String getCodingSchema()
+    {
+        return codingSchema;
+    }
+
+    public void setCodingSchema( String codingSchema )
+    {
+        this.codingSchema = codingSchema;
+    }
+
+    public String getValue()
+    {
+        return value;
+    }
+
+    public void setValue( String value )
+    {
+        this.value = value;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Name.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Name.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Name.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,126 @@
+package org.hisp.dhis.web.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;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "name", namespace = "urn:ihe:iti:csd:2013" )
+public class Name
+{
+    @XmlElement( name = "commonName", namespace = "urn:ihe:iti:csd:2013", required = true )
+    private List<CommonName> commonNames;
+
+    @XmlElement( name = "honorific", namespace = "urn:ihe:iti:csd:2013" )
+    private String honorific;
+
+    @XmlElement( name = "forename", namespace = "urn:ihe:iti:csd:2013" )
+    private String forename;
+
+    @XmlElement( name = "otherNames", namespace = "urn:ihe:iti:csd:2013" )
+    private List<String> otherNames = new ArrayList<String>();
+
+    @XmlElement( name = "surname", namespace = "urn:ihe:iti:csd:2013" )
+    private String surname;
+
+    @XmlElement( name = "suffix", namespace = "urn:ihe:iti:csd:2013" )
+    private String suffix;
+
+    public Name()
+    {
+    }
+
+    public List<CommonName> getCommonNames()
+    {
+        return commonNames;
+    }
+
+    public void setCommonNames( List<CommonName> commonNames )
+    {
+        this.commonNames = commonNames;
+    }
+
+    public String getHonorific()
+    {
+        return honorific;
+    }
+
+    public void setHonorific( String honorific )
+    {
+        this.honorific = honorific;
+    }
+
+    public String getForename()
+    {
+        return forename;
+    }
+
+    public void setForename( String forename )
+    {
+        this.forename = forename;
+    }
+
+    public List<String> getOtherNames()
+    {
+        return otherNames;
+    }
+
+    public void setOtherNames( List<String> otherNames )
+    {
+        this.otherNames = otherNames;
+    }
+
+    public String getSurname()
+    {
+        return surname;
+    }
+
+    public void setSurname( String surname )
+    {
+        this.surname = surname;
+    }
+
+    public String getSuffix()
+    {
+        return suffix;
+    }
+
+    public void setSuffix( String suffix )
+    {
+        this.suffix = suffix;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/OperatingHours.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/OperatingHours.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/OperatingHours.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,112 @@
+package org.hisp.dhis.web.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;
+import java.util.Date;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "operatingHours", namespace = "urn:ihe:iti:csd:2013" )
+public class OperatingHours
+{
+    @XmlElement( name = "openFlag", namespace = "urn:ihe:iti:csd:2013" )
+    private String openFlag;
+
+    @XmlElement( name = "dayOfTheWeek", namespace = "urn:ihe:iti:csd:2013" )
+    private String dayOfTheWeek;
+
+    @XmlElement( name = "beginningHour", namespace = "urn:ihe:iti:csd:2013" )
+    private Date beginningHour;
+
+    @XmlElement( name = "endingHour", namespace = "urn:ihe:iti:csd:2013" )
+    private Date endingHour;
+
+    @XmlElement( name = "beginEffectiveDate", namespace = "urn:ihe:iti:csd:2013" )
+    private Date beginEffectiveDate;
+
+    public OperatingHours()
+    {
+    }
+
+    public String getOpenFlag()
+    {
+        return openFlag;
+    }
+
+    public void setOpenFlag( String openFlag )
+    {
+        this.openFlag = openFlag;
+    }
+
+    public String getDayOfTheWeek()
+    {
+        return dayOfTheWeek;
+    }
+
+    public void setDayOfTheWeek( String dayOfTheWeek )
+    {
+        this.dayOfTheWeek = dayOfTheWeek;
+    }
+
+    public Date getBeginningHour()
+    {
+        return beginningHour;
+    }
+
+    public void setBeginningHour( Date beginningHour )
+    {
+        this.beginningHour = beginningHour;
+    }
+
+    public Date getEndingHour()
+    {
+        return endingHour;
+    }
+
+    public void setEndingHour( Date endingHour )
+    {
+        this.endingHour = endingHour;
+    }
+
+    public Date getBeginEffectiveDate()
+    {
+        return beginEffectiveDate;
+    }
+
+    public void setBeginEffectiveDate( Date beginEffectiveDate )
+    {
+        this.beginEffectiveDate = beginEffectiveDate;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Organization.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Organization.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Organization.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,153 @@
+package org.hisp.dhis.web.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.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "organization", namespace = "urn:ihe:iti:csd:2013" )
+public class Organization
+{
+    @XmlAttribute( name = "oid" )
+    private String oid;
+
+    @XmlElement( name = "otherID", namespace = "urn:ihe:iti:csd:2013" )
+    private List<OtherID> otherID = new ArrayList<OtherID>();
+
+    @XmlElement( name = "codedType", namespace = "urn:ihe:iti:csd:2013" )
+    private List<CodedType> codedTypes = new ArrayList<CodedType>();
+
+    @XmlElement( name = "primaryName", namespace = "urn:ihe:iti:csd:2013" )
+    private String primaryName;
+
+    @XmlElement( name = "otherName", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Name> otherName = new ArrayList<Name>();
+
+    @XmlElement( name = "address", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Address> addresses = new ArrayList<Address>();
+
+    @XmlElement( name = "contact", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Contact> contacts = new ArrayList<Contact>();
+
+    @XmlElement( name = "service", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Service> services = new ArrayList<Service>();
+
+    public Organization()
+    {
+    }
+
+    public String getOid()
+    {
+        return oid;
+    }
+
+    public void setOid( String oid )
+    {
+        this.oid = oid;
+    }
+
+    public List<OtherID> getOtherID()
+    {
+        return otherID;
+    }
+
+    public void setOtherID( List<OtherID> otherID )
+    {
+        this.otherID = otherID;
+    }
+
+    public List<CodedType> getCodedTypes()
+    {
+        return codedTypes;
+    }
+
+    public void setCodedTypes( List<CodedType> codedTypes )
+    {
+        this.codedTypes = codedTypes;
+    }
+
+    public String getPrimaryName()
+    {
+        return primaryName;
+    }
+
+    public void setPrimaryName( String primaryName )
+    {
+        this.primaryName = primaryName;
+    }
+
+    public List<Name> getOtherName()
+    {
+        return otherName;
+    }
+
+    public void setOtherName( List<Name> otherName )
+    {
+        this.otherName = otherName;
+    }
+
+    public List<Address> getAddresses()
+    {
+        return addresses;
+    }
+
+    public void setAddresses( List<Address> addresses )
+    {
+        this.addresses = addresses;
+    }
+
+    public List<Contact> getContacts()
+    {
+        return contacts;
+    }
+
+    public void setContacts( List<Contact> contacts )
+    {
+        this.contacts = contacts;
+    }
+
+    public List<Service> getServices()
+    {
+        return services;
+    }
+
+    public void setServices( List<Service> services )
+    {
+        this.services = services;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/OtherID.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/OtherID.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/OtherID.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,78 @@
+package org.hisp.dhis.web.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.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "otherID", namespace = "urn:ihe:iti:csd:2013" )
+public class OtherID
+{
+    @XmlAttribute( name = "code", required = true )
+    private String code;
+
+    @XmlAttribute( name = "assigningAuthorityName", required = true )
+    private String assigningAuthorityName;
+
+    public OtherID()
+    {
+    }
+
+    public OtherID( String code, String assigningAuthorityName )
+    {
+        this.code = code;
+        this.assigningAuthorityName = assigningAuthorityName;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public void setCode( String code )
+    {
+        this.code = code;
+    }
+
+    public String getAssigningAuthorityName()
+    {
+        return assigningAuthorityName;
+    }
+
+    public void setAssigningAuthorityName( String assigningAuthorityName )
+    {
+        this.assigningAuthorityName = assigningAuthorityName;
+    }
+}

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Person.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Person.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Person.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,57 @@
+package org.hisp.dhis.web.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;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "person", namespace = "urn:ihe:iti:csd:2013" )
+public class Person
+{
+    @XmlElement( name = "name", namespace = "urn:ihe:iti:csd:2013" )
+    private Name name;
+
+    @XmlElement( name = "address", namespace = "urn:ihe:iti:csd:2013" )
+    private List<Address> addresses = new ArrayList<Address>();
+
+    @XmlElement( name = "gender", namespace = "urn:ihe:iti:csd:2013" )
+    private String gender;
+
+    public Person()
+    {
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Record.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Record.java	2014-01-14 04:30:06 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Record.java	2014-01-14 08:36:11 +0000
@@ -41,13 +41,13 @@
 @XmlRootElement( name = "record", namespace = "urn:ihe:iti:csd:2013" )
 public class Record
 {
-    @XmlAttribute( name = "created" )
+    @XmlAttribute( name = "created", required = true )
     private Date created;
 
-    @XmlAttribute( name = "updated" )
+    @XmlAttribute( name = "updated", required = true )
     private Date updated;
 
-    @XmlAttribute( name = "status" )
+    @XmlAttribute( name = "status", required = true )
     private String status;
 
     @XmlAttribute( name = "sourceDirectory" )

=== added file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Service.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Service.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/csd/domain/csd/Service.java	2014-01-14 08:36:11 +0000
@@ -0,0 +1,88 @@
+package org.hisp.dhis.web.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.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@XmlAccessorType( XmlAccessType.FIELD )
+@XmlRootElement( name = "service", namespace = "urn:ihe:iti:csd:2013" )
+public class Service
+{
+    @XmlAttribute( name = "oid" )
+    private String oid;
+
+    @XmlElement( name = "language", namespace = "urn:ihe:iti:csd:2013" )
+    private Language language;
+
+    @XmlElement( name = "operatingHours", namespace = "urn:ihe:iti:csd:2013" )
+    private List<OperatingHours> operatingHours = new ArrayList<OperatingHours>();
+
+    public Service()
+    {
+    }
+
+    public String getOid()
+    {
+        return oid;
+    }
+
+    public void setOid( String oid )
+    {
+        this.oid = oid;
+    }
+
+    public Language getLanguage()
+    {
+        return language;
+    }
+
+    public void setLanguage( Language language )
+    {
+        this.language = language;
+    }
+
+    public List<OperatingHours> getOperatingHours()
+    {
+        return operatingHours;
+    }
+
+    public void setOperatingHours( List<OperatingHours> operatingHours )
+    {
+        this.operatingHours = operatingHours;
+    }
+}