diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php
index 945f524..c7dd050 100644
--- a/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php
+++ b/backend/lib/Model/Proxy/VolkszaehlerModelAggregatorProxy.php
@@ -27,46 +27,34 @@ class VolkszaehlerModelAggregatorProxy extends \Volkszaehler\Model\Aggregator im
     }
 
     
-    public function addAggregator(\Volkszaehler\Model\Aggregator $child)
+    public function addChild(\Volkszaehler\Model\Entity $child)
     {
         $this->_load();
-        return parent::addAggregator($child);
+        return parent::addChild($child);
     }
 
-    public function removeAggregator(\Volkszaehler\Model\Aggregator $child)
+    public function removeChild(\Volkszaehler\Model\Entity $child)
     {
         $this->_load();
-        return parent::removeAggregator($child);
+        return parent::removeChild($child);
     }
 
-    public function addChannel(\Volkszaehler\Model\Channel $child)
+    public function getChildren()
     {
         $this->_load();
-        return parent::addChannel($child);
+        return parent::getChildren();
     }
 
-    public function removeChannel(\Volkszaehler\Model\Channel $child)
+    public function checkProperties()
     {
         $this->_load();
-        return parent::removeChannel($child);
+        return parent::checkProperties();
     }
 
-    public function getChannels()
+    public function getProperty($key)
     {
         $this->_load();
-        return parent::getChannels();
-    }
-
-    public function checkPersist()
-    {
-        $this->_load();
-        return parent::checkPersist();
-    }
-
-    public function getProperty($name)
-    {
-        $this->_load();
-        return parent::getProperty($name);
+        return parent::getProperty($key);
     }
 
     public function getProperties($prefix = NULL)
@@ -81,10 +69,10 @@ class VolkszaehlerModelAggregatorProxy extends \Volkszaehler\Model\Aggregator im
         return parent::setProperty($key, $value);
     }
 
-    public function unsetProperty($name, \Doctrine\ORM\EntityManager $em)
+    public function unsetProperty($key, \Doctrine\ORM\EntityManager $em)
     {
         $this->_load();
-        return parent::unsetProperty($name, $em);
+        return parent::unsetProperty($key, $em);
     }
 
     public function getId()
@@ -120,6 +108,6 @@ class VolkszaehlerModelAggregatorProxy extends \Volkszaehler\Model\Aggregator im
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'channels', 'children', 'parents');
+        return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents', 'children');
     }
 }
\ No newline at end of file
diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php
index 0504523..8d8c664 100644
--- a/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php
+++ b/backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php
@@ -33,16 +33,16 @@ class VolkszaehlerModelChannelProxy extends \Volkszaehler\Model\Channel implemen
         return parent::addData($data);
     }
 
-    public function checkPersist()
+    public function checkProperties()
     {
         $this->_load();
-        return parent::checkPersist();
+        return parent::checkProperties();
     }
 
-    public function getProperty($name)
+    public function getProperty($key)
     {
         $this->_load();
-        return parent::getProperty($name);
+        return parent::getProperty($key);
     }
 
     public function getProperties($prefix = NULL)
@@ -57,10 +57,10 @@ class VolkszaehlerModelChannelProxy extends \Volkszaehler\Model\Channel implemen
         return parent::setProperty($key, $value);
     }
 
-    public function unsetProperty($name, \Doctrine\ORM\EntityManager $em)
+    public function unsetProperty($key, \Doctrine\ORM\EntityManager $em)
     {
         $this->_load();
-        return parent::unsetProperty($name, $em);
+        return parent::unsetProperty($key, $em);
     }
 
     public function getId()
@@ -96,6 +96,6 @@ class VolkszaehlerModelChannelProxy extends \Volkszaehler\Model\Channel implemen
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'data', 'aggregators');
+        return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents', 'data', 'aggregators');
     }
 }
\ No newline at end of file
diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php
index 551c28c..83171ca 100644
--- a/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php
+++ b/backend/lib/Model/Proxy/VolkszaehlerModelEntityProxy.php
@@ -27,16 +27,16 @@ class VolkszaehlerModelEntityProxy extends \Volkszaehler\Model\Entity implements
     }
 
     
-    public function checkPersist()
+    public function checkProperties()
     {
         $this->_load();
-        return parent::checkPersist();
+        return parent::checkProperties();
     }
 
-    public function getProperty($name)
+    public function getProperty($key)
     {
         $this->_load();
-        return parent::getProperty($name);
+        return parent::getProperty($key);
     }
 
     public function getProperties($prefix = NULL)
@@ -51,10 +51,10 @@ class VolkszaehlerModelEntityProxy extends \Volkszaehler\Model\Entity implements
         return parent::setProperty($key, $value);
     }
 
-    public function unsetProperty($name, \Doctrine\ORM\EntityManager $em)
+    public function unsetProperty($key, \Doctrine\ORM\EntityManager $em)
     {
         $this->_load();
-        return parent::unsetProperty($name, $em);
+        return parent::unsetProperty($key, $em);
     }
 
     public function getId()
@@ -90,6 +90,6 @@ class VolkszaehlerModelEntityProxy extends \Volkszaehler\Model\Entity implements
 
     public function __sleep()
     {
-        return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties');
+        return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents');
     }
 }
\ No newline at end of file
diff --git a/backend/lib/Model/Proxy/VolkszaehlerModelPropertyProxy.php b/backend/lib/Model/Proxy/VolkszaehlerModelPropertyProxy.php
index 5185445..ab7b929 100644
--- a/backend/lib/Model/Proxy/VolkszaehlerModelPropertyProxy.php
+++ b/backend/lib/Model/Proxy/VolkszaehlerModelPropertyProxy.php
@@ -39,6 +39,18 @@ class VolkszaehlerModelPropertyProxy extends \Volkszaehler\Model\Property implem
         return parent::validate();
     }
 
+    public function checkRemove()
+    {
+        $this->_load();
+        return parent::checkRemove();
+    }
+
+    public function checkPersist()
+    {
+        $this->_load();
+        return parent::checkPersist();
+    }
+
     public function getKey()
     {
         $this->_load();