diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php
index 7aa7c00e..e8a4d4bb 100644
--- a/library/Director/IcingaConfig/IcingaConfig.php
+++ b/library/Director/IcingaConfig/IcingaConfig.php
@@ -30,9 +30,13 @@ class IcingaConfig
         $this->db = $db;
         $this
             ->createFileFromDb('zone')
+            ->createFileFromDb('endpoint')
             ->createFileFromDb('command')
+            ->createFileFromDb('hostGroup')
             ->createFileFromDb('host')
+            ->createFileFromDb('serviceGroup')
             ->createFileFromDb('service')
+            ->createFileFromDb('userGroup')
             ->createFileFromDb('user')
             ;
 
@@ -53,7 +57,7 @@ class IcingaConfig
                 $file->prepend("library \"methods\"\n\n");
             }
             $file->addObjects($objects);
-            $this->files[$type . 's.conf'] = $file;
+            $this->files[strtolower($type) . 's.conf'] = $file;
         }
 
         return $this;