=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java	2011-06-01 15:28:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java	2011-06-01 15:32:01 +0000
@@ -29,6 +29,7 @@
 
 import java.io.Serializable;
 
+import org.hisp.dhis.dataelement.DataElementGroup;
 import org.hisp.dhis.user.UserGroup;
 
 /**
@@ -46,6 +47,8 @@
     
     private UserGroup messageRecipients;
 
+    private DataElementGroup infrastructuralDataElements;
+    
     public Configuration()
     {
     }
@@ -69,4 +72,14 @@
     {
         this.messageRecipients = messageRecipients;
     }
+
+    public DataElementGroup getInfrastructuralDataElements()
+    {
+        return infrastructuralDataElements;
+    }
+
+    public void setInfrastructuralDataElements( DataElementGroup infrastructuralDataElements )
+    {
+        this.infrastructuralDataElements = infrastructuralDataElements;
+    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2011-06-01 15:28:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2011-06-01 15:32:01 +0000
@@ -30,10 +30,12 @@
 import java.util.Iterator;
 
 import org.hisp.dhis.common.GenericStore;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Lars Helge Overland
  */
+@Transactional
 public class DefaultConfigurationService
     implements ConfigurationService
 {
@@ -43,6 +45,10 @@
     {
         this.configurationStore = configurationStore;
     }
+
+    // -------------------------------------------------------------------------
+    // ConfigurationService implementation
+    // -------------------------------------------------------------------------
     
     @Override
     public void setConfiguration( Configuration configuration )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2011-06-01 15:28:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2011-06-01 15:32:01 +0000
@@ -12,5 +12,7 @@
 
 	<one-to-one name="messageRecipients" class="org.hisp.dhis.user.UserGroup"/>
 
+	<one-to-one name="infrastructuralDataElements" class="org.hisp.dhis.dataelement.DataElementGroup"/>
+
   </class>
 </hibernate-mapping>